Skip to content

Conversation

@aciidgh
Copy link
Contributor

@aciidgh aciidgh commented Oct 18, 2017

https://bugs.swift.org/browse/SR-6084
rdar://problem/35040697 [SR-6084]: libdispatch missing from Trunk Development snapshots

@shahmishal
Copy link
Member

//cc @compnerd @dgrove-oss

@shahmishal
Copy link
Member

swiftlang/swift#12502

@swift-ci test

@aciidgh
Copy link
Contributor Author

aciidgh commented Oct 19, 2017

@compnerd updated!

@shahmishal
Copy link
Member

swiftlang/swift#12502

@swift-ci test

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")
Copy link
Contributor Author

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/

Copy link
Member

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

Copy link
Contributor Author

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.

Copy link
Contributor Author

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
@aciidgh
Copy link
Contributor Author

aciidgh commented Oct 19, 2017

swiftlang/swift#12502

@swift-ci test

@aciidgh
Copy link
Contributor Author

aciidgh commented Oct 19, 2017

swiftlang/swift#12502

@swift-ci test

@shahmishal shahmishal merged commit 6d6dc2e into swiftlang:master Oct 19, 2017
@aciidgh aciidgh deleted the fix-install-path branch October 19, 2017 19:45
ktopley-apple pushed a commit that referenced this pull request Dec 6, 2018
Fix the install path for the toolchain

Signed-off-by: Daniel A. Steffen <dsteffen@apple.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants