averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pass SDK paths explicitly when building Runtimes in macOS smoketest

Browse Source 
As per 7b19531291
CMake 4.0 does not pass `-sdk` to compiler invocations if the user does
not provide `CMAKE_OSX_SYSROOT` -- this in turn causes failures in
linking.

Addresses rdar://163672815
This commit is contained in:
Eric Miotto
2025-10-29 15:24:13 -07:00
parent a6cae4acd6
commit 535f83a527
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -1686,7 +1686,8 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
-DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS}
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
-DSwiftCore_INSTALL_NESTED_SUBDIR=YES
-DSwiftCore_ENABLE_CONCURRENCY=${build_concurrency})
-DSwiftCore_ENABLE_CONCURRENCY=${build_concurrency}
-DCMAKE_OSX_SYSROOT:PATH=${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH})
if(NOT ${CMAKE_CROSSCOMPILING})
add_dependencies("${stdlib_target}-core" swift-frontend)
endif()
@@ -1714,7 +1715,8 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
-DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS}
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE
-DSwiftOverlay_ENABLE_CXX_INTEROP=TRUE)
-DSwiftOverlay_ENABLE_CXX_INTEROP=TRUE
-DCMAKE_OSX_SYSROOT:PATH=${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH})
ExternalProject_Add("${stdlib_target}-Supplemental"
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Runtimes/Supplemental"
@@ -1739,7 +1741,8 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
-DCMAKE_ASM_COMPILER_TARGET:STRING=${stdlib_target_triple}
-DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS}
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE)
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE
-DCMAKE_OSX_SYSROOT:PATH=${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH})
endforeach()
endforeach()
endif()

1
Runtimes/Supplemental/CMakeLists.txt
View File

@@ -42,6 +42,7 @@ set(COMMON_OPTIONS
-DCMAKE_ASM_COMPILER_TARGET=${CMAKE_ASM_COMPILER_TARGET}
-DCMAKE_Swift_COMPILER_TARGET=${CMAKE_Swift_COMPILER_TARGET}
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=${CMAKE_FIND_PACKAGE_PREFER_CONFIG}
-DCMAKE_OSX_SYSROOT:PATH=${CMAKE_OSX_SYSROOT}
${SwiftCore_DIR_FLAG}
${MAKE_PROGRAM_FLAG})