Skip to content

Commit

Permalink
[CMake] Remove the symlink to Xcode's arclite libraries.
Browse files Browse the repository at this point in the history
With 877b51d, we'll find them using 'xcrun' if Swift isn't located next
to Clang.
  • Loading branch information
jrose-apple committed Nov 10, 2015
1 parent 23ac137 commit b789919
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 23 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ set(SWIFT_ENABLE_GOLD_LINKER FALSE CACHE BOOL
"Enable using the gold linker when available")

set(_SWIFT_KNOWN_INSTALL_COMPONENTS
"compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;clang-libclang;arclite-symlink;stdlib;stdlib-experimental;sdk-overlay;editor-integration;tools;testsuite-tools;dev;sourcekit-xpc-service;sourcekit-inproc")
"compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;clang-libclang;stdlib;stdlib-experimental;sdk-overlay;editor-integration;tools;testsuite-tools;dev;sourcekit-xpc-service;sourcekit-inproc")

# Set the SWIFT_INSTALL_COMPONENTS variable to the default value if it is not passed in via -D
set(SWIFT_INSTALL_COMPONENTS "${_SWIFT_KNOWN_INSTALL_COMPONENTS}" CACHE STRING
Expand Down
22 changes: 0 additions & 22 deletions stdlib/public/SwiftShims/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,28 +84,6 @@ add_custom_command_target(unused_var
COMMENT "Symlinking Clang resource headers into ${SWIFTLIB_DIR}/clang")
add_dependencies(copy_shim_headers symlink_clang_headers)

include(SwiftDarwin)
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
# Symlink in arclite from the XcodeDefault toolchain.
get_default_toolchain_dir(toolchain_dir)
add_custom_command_target(unused_var
COMMAND
"${CMAKE_COMMAND}" "-E" "make_directory"
"${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib"
COMMAND
"${CMAKE_COMMAND}" "-E" "create_symlink"
"${toolchain_dir}/usr/lib/arc"
"${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/arc"
CUSTOM_TARGET_NAME "symlink_arclite"
OUTPUT "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/arc"
COMMENT "Symlinking toolchain's arclite into ${SWIFTLIB_DIR}/arc")
add_dependencies(copy_shim_headers symlink_arclite)

swift_install_in_component(arclite-symlink
DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/arc"
DESTINATION "lib")
endif()

swift_install_in_component(compiler
FILES ${sources}
DESTINATION "lib/swift/shims")
Expand Down

0 comments on commit b789919

Please sign in to comment.