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

A couple of Makefile tweaks #14103

Merged
merged 5 commits into from
Nov 23, 2015
Merged

A couple of Makefile tweaks #14103

merged 5 commits into from
Nov 23, 2015

Conversation

Keno
Copy link
Member

@Keno Keno commented Nov 23, 2015

  • If we're building the world with a custom C++ library, make sure
    PATCHELF picks up the correct flags both at build time and when
    we use it.
  • Fix base/version_git.sh to also work when using O= out of tree
    builds (important for Compat, etc.)
  • Don't link against the C++ ABI level in C-only dependencies (because it might not be built yet)

@tkelman tkelman added the building Build system, or building Julia or its dependencies label Nov 23, 2015
@tkelman
Copy link
Contributor

tkelman commented Nov 23, 2015

Why does it matter which c++ std library patchelf gets built against?

@Keno
Copy link
Member Author

Keno commented Nov 23, 2015

If you're building everything with sanitizer it'll fail otherwise. Of course, the alternative solution is to change to build rules to prevent patchelf from being built with sanitizers, but that seemed like an annoying special case.

@tkelman
Copy link
Contributor

tkelman commented Nov 23, 2015

Huh. Picky, but whatever. It's also used on arpack, I suspect you'll need to change $(PATCHELF) to $(PATCHELF_BIN) there too.

Keno added 2 commits November 23, 2015 05:14
- If we're building the world with a custom C++ library, make sure
  PATCHELF picks up the correct flags both at build time and when
  we use it.
- Fix base/version_git.sh to also work when using O= out of tree
  builds (important for Compat, etc.)
@Keno Keno force-pushed the kf/makefiletweaks branch from 702d227 to 5fd2095 Compare November 23, 2015 05:14
@Keno
Copy link
Member Author

Keno commented Nov 23, 2015

Thanks, not sure why I missed that one.

Keno added 2 commits November 23, 2015 02:38
It's the prerequisite for this rule, so touching it will invalidate the libuv for all other trees.
@yuyichao
Copy link
Contributor

This also seems to fix the infinite loop in contrib/relative_path.sh /usr/bin /etc for me after #14097 .

tkelman added a commit that referenced this pull request Nov 23, 2015
@tkelman tkelman merged commit 0a7d8a3 into master Nov 23, 2015
@tkelman tkelman deleted the kf/makefiletweaks branch November 23, 2015 20:27
@vtjnash
Copy link
Member

vtjnash commented Nov 24, 2015

@tkelman 40386c9 shouldn't have been merged

@tkelman
Copy link
Contributor

tkelman commented Nov 24, 2015

whoops, sorry about that, we can revert

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
building Build system, or building Julia or its dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants