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
87
87
get -cpu-context.asm
88
88
)
89
89
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
+
90
100
add_swift_target_library (swiftRuntime ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
91
101
${RUNTIME_SOURCES}
92
102
@@ -103,6 +113,8 @@ add_swift_target_library(swiftRuntime ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STD
103
113
104
114
PRIVATE_LINK_LIBRARIES ${swift_runtime_link_libraries}
105
115
116
+ DEPLOYMENT_VERSION_OSX ${osx_deployment_target}
117
+
106
118
SWIFT_COMPILE_FLAGS
107
119
${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
108
120
${RUNTIME_COMPILE_FLAGS}
Original file line number Diff line number Diff line change @@ -39,11 +39,12 @@ set(BACKTRACING_SOURCES
39
39
Utils.swift
40
40
)
41
41
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
43
43
# 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" )
47
48
else ()
48
49
set (osx_deployment_target "${SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX} " )
49
50
endif ()
You can’t perform that action at this time.
0 commit comments