Skip to content
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

RFC: Avoid setting the RPATH for LLVM #22352

Merged
merged 2 commits into from
Jun 13, 2017
Merged

RFC: Avoid setting the RPATH for LLVM #22352

merged 2 commits into from
Jun 13, 2017

Conversation

ararslan
Copy link
Member

Some of the changes in #21788 adversely affected Linux. This partially reverts/restructures some of the changes.

@ararslan ararslan added domain:building Build system, or building Julia or its dependencies external dependencies Involves LLVM, OpenBLAS, or other linked libraries labels Jun 13, 2017
@ararslan ararslan requested a review from vtjnash June 13, 2017 04:46
@ararslan
Copy link
Member Author

@jlbuild !nuke

@jlbuild
Copy link

jlbuild commented Jun 13, 2017

Status of 1c973df builds:

Builder Name Nuke Build Download
linux32 COMPLETE ERRORED N/A
linux64 COMPLETE ERRORED N/A
linuxaarch64 COMPLETE COMPLETE Download
linuxarmv7l COMPLETE COMPLETE Download
linuxppc64le COMPLETE COMPLETE Download
osx64 COMPLETE COMPLETE Download
win32 CANCELED N/A N/A
win64 COMPLETE ERRORED N/A

Copy link
Sponsor Member

@vtjnash vtjnash left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@vtjnash
Copy link
Sponsor Member

vtjnash commented Jun 13, 2017

I don't know if this was related to any of your PRs, but I noticed we're creating some of these variables as normal recursively expanded ones, instead of as simply-expanded ones. We may want to add this patch to declare these variables as being of type := before using them.

--- a/deps/llvm.mk
+++ b/deps/llvm.mk
@@ -60,6 +60,12 @@ else
 LLVM_TARGETS := host;NVPTX
 endif
 
+LLVM_CFLAGS :=
+LLVM_CXXFLAGS :=
+LLVM_CPPFLAGS :=
+LLVM_LDFLAGS :=
+LLVM_CMAKE :=
+
 # Allow adding LLVM specific flags
 LLVM_CFLAGS += $(CFLAGS)
 LLVM_CXXFLAGS += $(CXXFLAGS)

@ararslan
Copy link
Member Author

No, I think the variable declaration was a preexisting condition. I've added your patch as a separate commit. Thanks!

@tkelman
Copy link
Contributor

tkelman commented Jun 13, 2017

Why is llvm picky about this? leave a comment by the CMAKE_COMMON saying not to put anything rpath related there for this reason, so we aren't tempted to do this again by accident?

@ararslan
Copy link
Member Author

ararslan commented Jun 13, 2017

Why is llvm picky about this?

¯\_(ツ)_/¯ It isn't on FreeBSD, which is why I never noticed this

leave a comment [...] so we aren't tempted to do this again by accident?

Good idea, will do once CI is done so I don't end up just queuing up a ton of builds here

Edit: Done, squashed into first commit

@ararslan ararslan changed the title WIP: Avoid setting the RPATH for LLVM RFC: Avoid setting the RPATH for LLVM Jun 13, 2017
ifeq ($(OS),FreeBSD)
ifneq ($(GCCPATH),)
INSTALL_RPATH := "\$$ORIGIN:$(GCCPATH)"
CMAKE_COMMON += -DCMAKE_INSTALL_RPATH="\$$ORIGIN:$(GCCPATH)"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This actually ends up duplicating the RPATH specification on FreeBSD, though I nuked everything, rebuilt from scratch, and tested everything, and things are fine.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

@ararslan ararslan merged commit 823d3b6 into master Jun 13, 2017
@ararslan ararslan deleted the aa/unbreak-rpath branch June 13, 2017 17:50
iblislin added a commit to iblislin/julia that referenced this pull request Jul 2, 2017
iblislin added a commit to iblislin/julia that referenced this pull request Jul 2, 2017
Tweak the order of libgcc_s in DT_NEEDED.
Make FreeBSD do not require `BUILD_CUSTOM_LIBCXX`.

See also: JuliaLang#21788, JuliaLang#22352
iblislin added a commit to iblislin/julia that referenced this pull request Jul 2, 2017
Tweak the order of libgcc_s in DT_NEEDED.
Make FreeBSD do not require `BUILD_CUSTOM_LIBCXX`.

See also: JuliaLang#21788, JuliaLang#22352
ararslan pushed a commit that referenced this pull request Jul 10, 2017
Tweak the order of libgcc_s in DT_NEEDED on FreeBSD so that building on FreeBSD does not require `BUILD_CUSTOM_LIBCXX`.

See also: #21788, #22352
jeffwong pushed a commit to jeffwong/julia that referenced this pull request Jul 24, 2017
Tweak the order of libgcc_s in DT_NEEDED on FreeBSD so that building on FreeBSD does not require `BUILD_CUSTOM_LIBCXX`.

See also: JuliaLang#21788, JuliaLang#22352
ararslan added a commit that referenced this pull request Apr 25, 2018
Ref #22352
(cherry picked from commit 8b8fa11)
ararslan pushed a commit that referenced this pull request Apr 25, 2018
ararslan pushed a commit that referenced this pull request Apr 25, 2018
Tweak the order of libgcc_s in DT_NEEDED on FreeBSD so that building on FreeBSD does not require `BUILD_CUSTOM_LIBCXX`.

See also: #21788, #22352

Ref #22656
(cherry picked from commit d90c215)
ararslan added a commit that referenced this pull request May 2, 2018
Ref #22352
(cherry picked from commit 8b8fa11)
ararslan pushed a commit that referenced this pull request May 2, 2018
ararslan pushed a commit that referenced this pull request May 2, 2018
Tweak the order of libgcc_s in DT_NEEDED on FreeBSD so that building on FreeBSD does not require `BUILD_CUSTOM_LIBCXX`.

See also: #21788, #22352

Ref #22656
(cherry picked from commit d90c215)
ararslan added a commit that referenced this pull request May 8, 2018
Ref #22352
(cherry picked from commit 8b8fa11)
ararslan pushed a commit that referenced this pull request May 8, 2018
ararslan pushed a commit that referenced this pull request May 8, 2018
Tweak the order of libgcc_s in DT_NEEDED on FreeBSD so that building on FreeBSD does not require `BUILD_CUSTOM_LIBCXX`.

See also: #21788, #22352

Ref #22656
(cherry picked from commit d90c215)
ararslan added a commit that referenced this pull request May 27, 2018
Ref #22352
(cherry picked from commit 8b8fa11)
ararslan pushed a commit that referenced this pull request May 27, 2018
ararslan pushed a commit that referenced this pull request May 27, 2018
Tweak the order of libgcc_s in DT_NEEDED on FreeBSD so that building on FreeBSD does not require `BUILD_CUSTOM_LIBCXX`.

See also: #21788, #22352

Ref #22656
(cherry picked from commit d90c215)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
domain:building Build system, or building Julia or its dependencies external dependencies Involves LLVM, OpenBLAS, or other linked libraries
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants