Skip to content

Commit 6f1566a

Browse files
authored
Merge pull request #2297 from rintaro/5.10-cmake-abi-name-rdar116951101-2
[5.10][CMake] Remove set(CACHE) line for SWIFT_MODULE_ABI_NAME_PREFIX
2 parents 614b6a5 + 32d941e commit 6f1566a

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ if(CMAKE_VERSION VERSION_LESS 3.21)
2222
endif()
2323
endif()
2424

25-
set(SWIFT_MODULE_ABI_NAME_PREFIX CACHE STRING "ABI name prefix to avoid name conflicts")
26-
2725
# The subdirectory into which host libraries will be installed.
2826
set(SWIFT_HOST_LIBRARIES_SUBDIRECTORY "swift/host")
2927

cmake/modules/AddSwiftHostLibrary.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ function(add_swift_syntax_library name)
7979
-emit-module-interface-path;${module_interface_file}
8080
>)
8181
if(SWIFT_MODULE_ABI_NAME_PREFIX)
82+
# ABI name prefix. this can be used to avoid name conflicts.
8283
target_compile_options("${name}" PRIVATE
8384
$<$<COMPILE_LANGUAGE:Swift>:
8485
"SHELL:-Xfrontend -module-abi-name"

0 commit comments

Comments
 (0)