Skip to content

Commit 79b5a1d

Browse files
committed
Adapt to new signature for llvm_install_symlink...
and match the usage pattern employed by other LLVM projects. For context about the underlying change see https://reviews.llvm.org/D117977 Addresses rdar://101396797
1 parent ade0c8c commit 79b5a1d

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,10 @@ if(SWIFT_PROFDATA_FILE AND EXISTS ${SWIFT_PROFDATA_FILE})
321321
add_definitions("-fprofile-instr-use=${SWIFT_PROFDATA_FILE}")
322322
endif()
323323

324+
set(SWIFT_TOOLS_INSTALL_DIR "bin" CACHE PATH
325+
"Path for binary subdirectory to use during installation.
326+
Used by add_swift_tool_symlink in AddSwift.cmake so that llvm_install_symlink generates the installation script properly.")
327+
324328
#
325329
# User-configurable Swift Standard Library specific options.
326330
#

cmake/modules/AddSwift.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -957,8 +957,8 @@ function(add_swift_fuzzer_host_tool executable)
957957
endfunction()
958958

959959
macro(add_swift_tool_symlink name dest component)
960-
add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE)
961-
llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE COMPONENT ${component})
960+
llvm_add_tool_symlink(SWIFT ${name} ${dest} ALWAYS_GENERATE)
961+
llvm_install_symlink(SWIFT ${name} ${dest} ALWAYS_GENERATE COMPONENT ${component})
962962
endmacro()
963963

964964
# Declare that files in this library are built with LLVM's support

0 commit comments

Comments
 (0)