File tree Expand file tree Collapse file tree 2 files changed +17
-4
lines changed Expand file tree Collapse file tree 2 files changed +17
-4
lines changed Original file line number Diff line number Diff line change @@ -87,6 +87,16 @@ set(LLVM_OPTIONAL_SOURCES
8787 get -cpu-context.asm
8888)
8989
90+ # We have to build with a deployment target of at least 10.15, otherwise
91+ # the tests will all fail because dyld will get confused at the use of
92+ # @rpath (from magic-symbols-for-install-name.c) and the `some Sequence<Frame>`
93+ # in Backtrace won't be accessible.
94+ if (SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX VERSION_LESS "10.15" )
95+ set (osx_deployment_target "10.15" )
96+ else ()
97+ set (osx_deployment_target "${SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX} " )
98+ endif ()
99+
90100add_swift_target_library(swiftRuntime ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
91101 ${RUNTIME_SOURCES}
92102
@@ -103,6 +113,8 @@ add_swift_target_library(swiftRuntime ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STD
103113
104114 PRIVATE_LINK_LIBRARIES ${swift_runtime_link_libraries}
105115
116+ DEPLOYMENT_VERSION_OSX ${osx_deployment_target}
117+
106118 SWIFT_COMPILE_FLAGS
107119 ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
108120 ${RUNTIME_COMPILE_FLAGS}
Original file line number Diff line number Diff line change @@ -39,11 +39,12 @@ set(BACKTRACING_SOURCES
3939 Utils.swift
4040 )
4141
42- # We have to build with a deployment target of at least 10.14.4 , otherwise
42+ # We have to build with a deployment target of at least 10.15 , otherwise
4343# the tests will all fail because dyld will get confused at the use of
44- # @rpath (from magic-symbols-for-install-name.c).
45- if (SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX VERSION_LESS "10.14.4" )
46- set (osx_deployment_target "10.14.4" )
44+ # @rpath (from magic-symbols-for-install-name.c) and the `some Sequence<Frame>`
45+ # in Backtrace won't be accessible.
46+ if (SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX VERSION_LESS "10.15" )
47+ set (osx_deployment_target "10.15" )
4748else ()
4849 set (osx_deployment_target "${SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX} " )
4950endif ()
You can’t perform that action at this time.
0 commit comments