diff options
author | Saleem Abdulrasool <compnerd@compnerd.org> | 2024-01-08 21:02:21 (GMT) |
---|---|---|
committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2024-01-09 17:13:34 (GMT) |
commit | 9e829779f249402071ee979705728db3066000fa (patch) | |
tree | ea3d9e762437041e84d32814492578f565ce5aba /Tests | |
parent | 38234058ff68d3e28b8c4672033dd118127581be (diff) | |
download | CMake-9e829779f249402071ee979705728db3066000fa.zip CMake-9e829779f249402071ee979705728db3066000fa.tar.gz CMake-9e829779f249402071ee979705728db3066000fa.tar.bz2 |
Swift: preserve `-static` for static library swiftmodules
The `-static` is important for the emission of the module as it is
serialized into the swiftmodule which then is used by the Swift frontend
to decide how to link to the symbol (via the GOT or not, or the IAT on
Windows). This repairs building static libraries with Swift on Windows.
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/RunCMake/Swift/RunCMakeTest.cmake | 6 | ||||
-rw-r--r-- | Tests/RunCMake/Swift/SwiftLibraryModuleCommand-check-stdout.txt | 3 | ||||
-rw-r--r-- | Tests/RunCMake/Swift/SwiftLibraryModuleCommand.cmake | 8 |
3 files changed, 17 insertions, 0 deletions
diff --git a/Tests/RunCMake/Swift/RunCMakeTest.cmake b/Tests/RunCMake/Swift/RunCMakeTest.cmake index 5de4346..b5210c9 100644 --- a/Tests/RunCMake/Swift/RunCMakeTest.cmake +++ b/Tests/RunCMake/Swift/RunCMakeTest.cmake @@ -76,6 +76,12 @@ elseif(RunCMake_GENERATOR STREQUAL Ninja) # -v: verbose to capture executed commands -n: dry-run to avoid actually compiling run_cmake_command(ForceResponseFile-check ${CMAKE_COMMAND} --build ${ForceResponseFile_TEST_BINARY_DIR} -- -vn) endblock() + + block() + set(SwiftLibraryModuleCommand_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/SwiftLibraryModuleCommand-build) + run_cmake(SwiftLibraryModuleCommand) + run_cmake_command(SwiftLibraryModuleCommand-check ${CMAKE_COMMAND} --build ${SwiftLibraryModuleCommand_TEST_BINARY_DIR} -- -n -v) + endblock() endif() elseif(RunCMake_GENERATOR STREQUAL "Ninja Multi-Config") if(CMake_TEST_Swift) diff --git a/Tests/RunCMake/Swift/SwiftLibraryModuleCommand-check-stdout.txt b/Tests/RunCMake/Swift/SwiftLibraryModuleCommand-check-stdout.txt new file mode 100644 index 0000000..85767eb --- /dev/null +++ b/Tests/RunCMake/Swift/SwiftLibraryModuleCommand-check-stdout.txt @@ -0,0 +1,3 @@ +.*swiftc(.exe)? .* -parse-as-library -static -emit-module .* -module-name StaticLibrary [^ +]* +.*swiftc(.exe)? .* -parse-as-library -emit-module .* -module-name DynamicLibrary diff --git a/Tests/RunCMake/Swift/SwiftLibraryModuleCommand.cmake b/Tests/RunCMake/Swift/SwiftLibraryModuleCommand.cmake new file mode 100644 index 0000000..7127751 --- /dev/null +++ b/Tests/RunCMake/Swift/SwiftLibraryModuleCommand.cmake @@ -0,0 +1,8 @@ +if(POLICY CMP0157) + cmake_policy(SET CMP0157 NEW) +endif() + +enable_language(Swift) + +add_library(StaticLibrary STATIC L.swift) +add_library(DynamicLibrary SHARED L.swift) |