File tree Expand file tree Collapse file tree 2 files changed +15
-13
lines changed Expand file tree Collapse file tree 2 files changed +15
-13
lines changed Original file line number Diff line number Diff line change @@ -413,6 +413,8 @@ endif()
413
413
414
414
if (MSVC OR "${CMAKE_SIMULATE_ID} " STREQUAL MSVC )
415
415
include (ClangClCompileRules )
416
+ elseif (UNIX )
417
+ include (UnixCompileRules )
416
418
endif ()
417
419
418
420
if (CMAKE_C_COMPILER_ID MATCHES Clang )
@@ -432,19 +434,6 @@ if(SWIFT_BUILD_SYNTAXPARSERLIB OR SWIFT_BUILD_SOURCEKIT)
432
434
endif ()
433
435
endif ()
434
436
435
- #
436
- # Assume a new enough ar to generate the index at construction time. This avoids
437
- # having to invoke ranlib as a secondary command.
438
- #
439
-
440
- set (CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> crs <TARGET> <LINK_FLAGS> <OBJECTS>" )
441
- set (CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> qs <TARGET> <LINK_FLAGS> <OBJECTS>" )
442
- set (CMAKE_C_ARCHIVE_FINISH "" )
443
-
444
- set (CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> crs <TARGET> <LINK_FLAGS> <OBJECTS>" )
445
- set (CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> qs <TARGET> <LINK_FLAGS> <OBJECTS>" )
446
- set (CMAKE_CXX_ARCHIVE_FINISH "" )
447
-
448
437
#
449
438
# Include CMake modules
450
439
#
Original file line number Diff line number Diff line change
1
+
2
+ #
3
+ # Assume a new enough ar to generate the index at construction time. This avoids
4
+ # having to invoke ranlib as a secondary command.
5
+ #
6
+
7
+ set (CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> crs <TARGET> <LINK_FLAGS> <OBJECTS>" )
8
+ set (CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> qs <TARGET> <LINK_FLAGS> <OBJECTS>" )
9
+ set (CMAKE_C_ARCHIVE_FINISH "" )
10
+
11
+ set (CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> crs <TARGET> <LINK_FLAGS> <OBJECTS>" )
12
+ set (CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> qs <TARGET> <LINK_FLAGS> <OBJECTS>" )
13
+ set (CMAKE_CXX_ARCHIVE_FINISH "" )
You can’t perform that action at this time.
0 commit comments