-
Notifications
You must be signed in to change notification settings - Fork 480
Fix the install path for the toolchain #314
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.
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
Conversation
|
//cc @compnerd @dgrove-oss |
0e611f0 to
ad7fc86
Compare
|
@compnerd updated! |
CMakeLists.txt
Outdated
| set(CMAKE_C_VISIBILITY_PRESET hidden) | ||
| set(CMAKE_CXX_STANDARD 11) | ||
|
|
||
| set(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Installation directory for libraries") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@compnerd Please comment on the PR and not the commit as force pushing removes them.
This is needed because its value is lib/x86-gnu-linux/ (or similar), where as we need to install the libraries at lib/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
GNUInstallDirs will set the value to lib or lib64 depending on the system that you are building for. The only place that the CMAKE_INSTALL_LIBDIR uses the form that you specify is when you are on Debian as that is the style that Debian uses. You should be able to override that from the command line. I think that is better handled in build-script rather than hardcoding it here.
See https://cmake.org/cmake/help/v3.4/module/GNUInstallDirs.html
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see. I don't know why it sets that path for Ubuntu then. Sure, I can override it in the build-script if that is preferable.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Alright, done!
https://bugs.swift.org/browse/SR-6084 <rdar://problem/35040697> [SR-6084]: libdispatch missing from Trunk Development snapshots
ad7fc86 to
7c4a8e7
Compare
Fix the install path for the toolchain Signed-off-by: Daniel A. Steffen <dsteffen@apple.com>
https://bugs.swift.org/browse/SR-6084
rdar://problem/35040697 [SR-6084]: libdispatch missing from Trunk Development snapshots