Skip to content

Commit 58a782b

Browse files
committed
[Runtimes][CMake] use config mode first in Supplemental build in CI
In this configuration we want to pull dependencies from the current build, not from the underlying SDK. Addresses rdar://151784135
1 parent 689491c commit 58a782b

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1684,7 +1684,8 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
16841684
-DCMAKE_C_COMPILER_TARGET:STRING=${stdlib_target_triple}
16851685
-DCMAKE_CXX_COMPILER_TARGET:STRING=${stdlib_target_triple}
16861686
-DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS}
1687-
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM})
1687+
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
1688+
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE)
16881689
endforeach()
16891690
endforeach()
16901691
endif()

Runtimes/Supplemental/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ set(COMMON_OPTIONS
3535
-DCMAKE_C_COMPILER_TARGET=${CMAKE_C_COMPILER_TARGET}
3636
-DCMAKE_CXX_COMPILER_TARGET=${CMAKE_CXX_COMPILER_TARGET}
3737
-DCMAKE_Swift_COMPILER_TARGET=${CMAKE_Swift_COMPILER_TARGET}
38+
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=${CMAKE_FIND_PACKAGE_PREFER_CONFIG}
3839
${SwiftCore_DIR_FLAG}
3940
${MAKE_PROGRAM_FLAG})
4041

0 commit comments

Comments
 (0)