Skip to content

Commit dd40b2f

Browse files
authored
Merge pull request #79071 from al45tair/eng/PR-143869185
[Backtracing] Bump minimum deployment targets.
2 parents 7d554b7 + 857c963 commit dd40b2f

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

stdlib/public/RuntimeModule/CMakeLists.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff 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+
90100
add_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}

stdlib/public/libexec/swift-backtrace/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff 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")
4748
else()
4849
set(osx_deployment_target "${SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX}")
4950
endif()

0 commit comments

Comments
 (0)