Skip to content

plutil: Fix RUNPATH and file permissions of installed binary #1789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 1, 2018
Merged

plutil: Fix RUNPATH and file permissions of installed binary #1789

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ include(SwiftSupport)
include(GNUInstallDirs)
include(ExternalProject)

string(TOLOWER ${CMAKE_SYSTEM_NAME} swift_os)
get_swift_host_arch(swift_arch)

ExternalProject_Add(CoreFoundation
SOURCE_DIR
${CMAKE_CURRENT_SOURCE_DIR}/CoreFoundation
Expand Down Expand Up @@ -286,6 +289,7 @@ add_swift_executable(plutil
${libdispatch_ldflags}
-lFoundation
${Foundation_INTERFACE_LIBRARIES}
-Xlinker;-rpath;-Xlinker;"\\\$\$ORIGIN/../lib/swift/${swift_os}"
SWIFT_FLAGS
-DDEPLOYMENT_RUNTIME_SWIFT
${deployment_enable_libdispatch}
Expand Down Expand Up @@ -477,9 +481,6 @@ if(ENABLE_TESTING)
${CMAKE_CURRENT_BINARY_DIR}/TestFoundation/xdgTestHelper${CMAKE_EXECUTABLE_SUFFIX})
endif()

string(TOLOWER ${CMAKE_SYSTEM_NAME} swift_os)
get_swift_host_arch(swift_arch)

# TODO(compnerd) honour lib vs lib64
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/swift/Foundation.swiftdoc
Expand Down Expand Up @@ -507,7 +508,7 @@ install(FILES
CoreFoundation/Base.subproj/module.map
DESTINATION
lib/swift/CoreFoundation)
install(FILES
install(PROGRAMS
${CMAKE_CURRENT_BINARY_DIR}/plutil
DESTINATION
${CMAKE_INSTALL_FULL_BINDIR})