diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2015-01-14 20:25:26 -0800 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-01-14 20:27:55 -0800 |
| commit | f3c6827373be102caae5dcbadd31e73ed60fa17f (patch) | |
| tree | 9f9d57c16edc218bd590ca9956eb5227d084c33f /pkgs/development/compilers/rustc | |
| parent | 16fe4be790f541d68c01897640fda11f9673b8e9 (diff) | |
rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc
Diffstat (limited to 'pkgs/development/compilers/rustc')
| -rw-r--r-- | pkgs/development/compilers/rustc/0.12.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/rustc/head.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/rustc/0.12.nix b/pkgs/development/compilers/rustc/0.12.nix index 9cbe3fec2c406..dda9be1f12854 100644 --- a/pkgs/development/compilers/rustc/0.12.nix +++ b/pkgs/development/compilers/rustc/0.12.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation { cp -r bin "$out/bin" '' + (if stdenv.isLinux then '' patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ - --set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/" \ + --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/" \ "$out/bin/rustc" '' else ""); }; diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 5aad9bfa5fff4..760fcdd851a6e 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { cp -r bin "$out/bin" '' + (if stdenv.isLinux then '' patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ - --set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/" \ + --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/" \ "$out/bin/rustc" '' else ""); }; |