Skip to content

Commit 414cfee

Browse files
committed
Remove /INCREMENTAL:NO flag for llbuild-tool and libllbuild targets on Windows
These were originally added 6 years ago in swiftlang#475 to "Disable incremental linking so llbuild.ilk's don't conflict" because at the time the command line tool and library targets were given the same OUTPUT_NAME, which conflicted. In swiftlang#1005 these targets were given distinct names, so the workaround should no longer be necessary. This helps unblock swiftlang/swift-build#757 because this flag is currently added without regard for the specific compiler driver in use, so the flag might not work based on whether clang-cl.exe or cl.exe vs clang.exe (where it would require a -Xlinker prefix), is used.
1 parent cbac2d9 commit 414cfee

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

products/libllbuild/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ target_link_libraries(llbuild PRIVATE
2121
llvmSupport
2222
SQLite::SQLite3)
2323

24-
if(CMAKE_SYSTEM_NAME STREQUAL Windows)
25-
set_target_properties(llbuild PROPERTIES LINK_FLAGS "/INCREMENTAL:NO")
26-
endif()
27-
2824
if(NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
2925
target_link_libraries(llbuild PRIVATE
3026
curses)

products/llbuild/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ target_link_libraries(llbuild-tool PRIVATE
1010
llvmSupport
1111
SQLite::SQLite3)
1212

13-
if(CMAKE_SYSTEM_NAME STREQUAL Windows)
14-
set_target_properties(llbuild-tool PROPERTIES LINK_FLAGS "/INCREMENTAL:NO")
15-
endif()
16-
1713
set_target_properties(llbuild-tool PROPERTIES
1814
OUTPUT_NAME llbuild)
1915

0 commit comments

Comments
 (0)