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.

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

Jump to bottom

FreeBSD: propose a simpler way to deal with libgcc_s #22656

Merged
merged 2 commits into from
Jul 10, 2017
Merged

FreeBSD: propose a simpler way to deal with libgcc_s #22656

merged 2 commits into from
Jul 10, 2017

Conversation

iblislin
Copy link
Member

@iblislin iblislin commented Jul 2, 2017 •
edited
Loading

Tweak the order of libgcc_s in DT_NEEDED.
Making FreeBSD do not require BUILD_CUSTOM_LIBCXX.

@tkelman tkelman added the system:freebsd Affects only FreeBSD label Jul 2, 2017
tkelman
tkelman reviewed Jul 2, 2017
View reviewed changes
deps/tools/common.mk
@@ -40,14 +40,10 @@ CMAKE_COMMON += -DCMAKE_RC_COMPILER="$$(which $(CROSS_COMPILE)windres)"
endif
endif

# NOTE: Do not make RPATH changes in CMAKE_COMMON on platforms other than FreeBSD, since
# it will make its way into the LLVM build flags, and LLVM is picky about RPATH (though
Copy link
Contributor

Choose a reason for hiding this comment

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

see this comment, shouldn't revert this

Copy link
Member Author

Choose a reason for hiding this comment

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

ok, I will revoke the first commit, then remove this code block only.

@iblislin
FreeBSD: propose a simpler way to deal with libgcc_s
fba8996 
Tweak the order of libgcc_s in DT_NEEDED.
Make FreeBSD do not require `BUILD_CUSTOM_LIBCXX`.

See also: JuliaLang#21788, JuliaLang#22352
iblislin
iblislin commented Jul 2, 2017
View reviewed changes
deps/tools/common.mk Outdated
@@ -43,11 +43,6 @@ endif
# NOTE: Do not make RPATH changes in CMAKE_COMMON on platforms other than FreeBSD, since
# it will make its way into the LLVM build flags, and LLVM is picky about RPATH (though
# apparently not on FreeBSD). Ref PR #22352
Copy link
Member Author

Choose a reason for hiding this comment

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

need to re-arrange this comment block elsewhere?

Copy link
Contributor

Choose a reason for hiding this comment

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

near the remaining rpath settings?

Copy link
Member Author

Choose a reason for hiding this comment

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

there is no any line related to CMAKE_INSTALL_RPATH in this file...

Copy link
Member

Choose a reason for hiding this comment

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

I'd just put the comment block near the top of the file so that anyone who goes into the file wanting to make RPATH changes will find it.

Copy link
Member Author

Choose a reason for hiding this comment

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

👌 @ df74190

@iblislin
Copy link
Member Author

iblislin commented Jul 2, 2017

Build of travis-ci got timeout....

@ararslan ararslan added the building Build system, or building Julia or its dependencies label Jul 2, 2017
@ararslan
Copy link
Member

ararslan commented Jul 2, 2017 •
edited
Loading

Very nice, a much more elegant solution than what I had initially put in place. I did a full nuke and rebuild locally on FreeBSD and this seems to be working great. Do we still need GCCPATH with this? Edit: Yeah probably, since we're explicitly giving it to FC.

@iblislin
Copy link
Member Author

iblislin commented Jul 8, 2017

good to go?

@ararslan ararslan merged commit d90c215 into JuliaLang:master Jul 10, 2017
@iblislin iblislin deleted the fix-libgcc_s branch July 11, 2017 00:14
jeffwong pushed a commit to jeffwong/julia that referenced this pull request Jul 24, 2017
@iblislin @jeffwong
A simpler way to deal with libgcc_s on FreeBSD (JuliaLang#22656)
060ab52 
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 pushed a commit that referenced this pull request Apr 25, 2018
@iblislin @ararslan
A simpler way to deal with libgcc_s on FreeBSD (#22656)
95661ea 
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 pushed a commit that referenced this pull request May 2, 2018
@iblislin @ararslan
A simpler way to deal with libgcc_s on FreeBSD (#22656)
b7188ea 
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 pushed a commit that referenced this pull request May 8, 2018
@iblislin @ararslan
A simpler way to deal with libgcc_s on FreeBSD (#22656)
e937449 
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 pushed a commit that referenced this pull request May 27, 2018
@iblislin @ararslan
A simpler way to deal with libgcc_s on FreeBSD (#22656)
e231870 
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
Reviewers

@tkelman tkelman tkelman left review comments

@ararslan ararslan ararslan approved these changes

Assignees
No one assigned
Labels
building Build system, or building Julia or its dependencies system:freebsd Affects only FreeBSD
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@iblislin @ararslan @tkelman