Skip to content

Commit afdfeef

Browse files
committed
[CMake] use same generator for compiler and stdlib builds
This will support configurations where ninja is not the search path, and will avoid problems that can arise from the stdlib build detecting and using a different generator. Addresses rdar://142268599
1 parent 55189ba commit afdfeef

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1611,7 +1611,8 @@ if(SWIFT_ENABLE_NEW_RUNTIME_BUILD)
16111611
-DCMAKE_Swift_COMPILER:FILEPATH=$<IF:$<BOOL:${CMAKE_CROSSCOMPILING}>,${CMAKE_Swift_COMPILER},$<PATH:REPLACE_FILENAME,$<TARGET_FILE:swift-frontend>,swiftc>>
16121612
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
16131613
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
1614-
-DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS})
1614+
-DCMAKE_COLOR_DIAGNOSTICS:BOOLEAN=${CMAKE_COLOR_DIAGNOSTICS}
1615+
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM})
16151616
if(NOT ${CMAKE_CROSSCOMPILING})
16161617
add_dependencies("${stdlib_target}" swift-frontend)
16171618
endif()

0 commit comments

Comments
 (0)