diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-09-26 02:09:22 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-09-26 02:09:22 -0500 |
| commit | 6eef893f5ca112101ce82a026c5239a36200d922 (patch) | |
| tree | b2c204ba782dfc2051149a56d696a9c4428611a9 | |
| parent | 92a9c5ac7d38d4536fa0a9337259b7f133ee9639 (diff) | |
| download | nixlib-6eef893f5ca112101ce82a026c5239a36200d922.tar nixlib-6eef893f5ca112101ce82a026c5239a36200d922.tar.gz nixlib-6eef893f5ca112101ce82a026c5239a36200d922.tar.bz2 nixlib-6eef893f5ca112101ce82a026c5239a36200d922.tar.lz nixlib-6eef893f5ca112101ce82a026c5239a36200d922.tar.xz nixlib-6eef893f5ca112101ce82a026c5239a36200d922.tar.zst nixlib-6eef893f5ca112101ce82a026c5239a36200d922.zip | |
stdenv: partial revert of f2bb59
/cc @Ericson2314 This line broke MacOS cross compilation. paxctl cannot be built on macOS. Maybe it can be fixed, but no reason to break things unnecessarily. Regardless, you definitely need to be more careful about backporting. I think it’s fine to move fast and break things on master but with release-18.09 we should be more careful. Something like more automated testing for cross compilation would also be helpful (hopefully even making it block).
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index daa9f66615c9..d1efa3602374 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -53,9 +53,6 @@ in lib.init bootStages ++ [ else buildPackages.gcc; extraNativeBuildInputs = old.extraNativeBuildInputs - ++ lib.optionals - (hostPlatform.isLinux && !buildPlatform.isLinux) - [ buildPackages.patchelf buildPackages.paxctl ] ++ lib.optional (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform)) buildPackages.updateAutotoolsGnuConfigScriptsHook |