diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-12 19:15:14 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-12 19:38:11 +0300 |
| commit | 391c3e505e08d4b12f0f06ca2d59c5552d37a373 (patch) | |
| tree | cbffe04b3a2aeff6f7cad3bddc9079ee23a7058d | |
| parent | 71e7f0cad4d3bd848d85380762e9f371f570778c (diff) | |
| download | nixlib-391c3e505e08d4b12f0f06ca2d59c5552d37a373.tar nixlib-391c3e505e08d4b12f0f06ca2d59c5552d37a373.tar.gz nixlib-391c3e505e08d4b12f0f06ca2d59c5552d37a373.tar.bz2 nixlib-391c3e505e08d4b12f0f06ca2d59c5552d37a373.tar.lz nixlib-391c3e505e08d4b12f0f06ca2d59c5552d37a373.tar.xz nixlib-391c3e505e08d4b12f0f06ca2d59c5552d37a373.tar.zst nixlib-391c3e505e08d4b12f0f06ca2d59c5552d37a373.zip | |
wrapCCMulti: split from gcc_multi
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 188788955ffe..02df6bd55323 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4044,18 +4044,20 @@ in gcc = gcc5; - gcc_multi = + wrapCCMulti = cc: if system == "x86_64-linux" then lowPrio ( let extraBuildCommands = '' echo "dontMoveLib64=1" >> $out/nix-support/setup-hook ''; - in wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi extraBuildCommands (gcc.cc.override { - stdenv = overrideCC stdenv (wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi "" gcc.cc); + in wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi extraBuildCommands (cc.cc.override { + stdenv = overrideCC stdenv (wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi "" cc.cc); profiledCompiler = false; enableMultilib = true; })) - else throw "Multilib gcc not supported on ‘${system}’"; + else throw "Multilib ${cc.name} not supported on ‘${system}’"; + + gcc_multi = wrapCCMulti gcc; gcc_debug = lowPrio (wrapCC (gcc.cc.override { stripped = false; |