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

libstdc++: add setup-hook #28998

Merged
merged 2 commits into from Sep 5, 2017
Merged

libstdc++: add setup-hook #28998

merged 2 commits into from Sep 5, 2017

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Sep 4, 2017

Motivation for this change

An alternative for #28870, this should also allow us to get rid of default_cxx_stdlib_compile entirely

Fixes #28223

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@LnL7 LnL7 added 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 9.needs: port to stable A PR needs a backport to the stable release. labels Sep 4, 2017
@mention-bot
Copy link

@LnL7, thanks for your PR! By analyzing the history of the files in this pull request, we identified @dtzWill, @copumpkin and @vcunat to be potential reviewers.

allowedRequisites = null;
cc = self.clang;
# Use the gcc libstdc++ when targeting linux.
extraBuildInputs = if targetPlatform.isLinux then [ libstdcxxHook ] else drv.extraBuildInputs;
Copy link
Member Author

Choose a reason for hiding this comment

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

perhaps this should be stdenv.cc.isGNU?

Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

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

Excellent! I do like stdenv.cc.isGNU too.

@LnL7 LnL7 merged commit 0adb83e into NixOS:master Sep 5, 2017
@LnL7 LnL7 added the 8.has: port to stable A PR already has a backport to the stable release. label Sep 5, 2017
@LnL7 LnL7 deleted the libstdcxx-hook branch September 5, 2017 19:49
@Ericson2314 Ericson2314 added this to After big PR in Cross compilation Sep 5, 2017
@Ericson2314 Ericson2314 moved this from After big PR to Needed by the big PR---nice to move pick off pieces of it and move here, rebasing the big PR on top in Cross compilation Sep 8, 2017
@samueldr samueldr removed the 9.needs: port to stable A PR needs a backport to the stable release. label Apr 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 8.has: port to stable A PR already has a backport to the stable release.
Projects
No open projects
Cross compilation
Needed by the big PR---nice to move p...
Development

Successfully merging this pull request may close these issues.

llvmPackages stdenv broken on master and unstable, can't find C++ headers?
4 participants