diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2015-01-14 20:44:00 -0800 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-01-14 20:47:49 -0800 |
| commit | 88eae464551f0efadccc8f64dd456679801b7939 (patch) | |
| tree | a3e4b2f6e11eac41caeebbe770d13c5fa59f5327 /pkgs/stdenv | |
| parent | f3c6827373be102caae5dcbadd31e73ed60fa17f (diff) | |
| download | nixlib-88eae464551f0efadccc8f64dd456679801b7939.tar nixlib-88eae464551f0efadccc8f64dd456679801b7939.tar.gz nixlib-88eae464551f0efadccc8f64dd456679801b7939.tar.bz2 nixlib-88eae464551f0efadccc8f64dd456679801b7939.tar.lz nixlib-88eae464551f0efadccc8f64dd456679801b7939.tar.xz nixlib-88eae464551f0efadccc8f64dd456679801b7939.tar.zst nixlib-88eae464551f0efadccc8f64dd456679801b7939.zip | |
rename occurrences of gcc.gcc to gcc.cc
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix | 16 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 16 |
3 files changed, 17 insertions, 17 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 529593bc059a..f1b5ae0dd1e0 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -283,7 +283,7 @@ rec { allowedRequisites = with stage4.pkgs; [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl - paxctl zlib pcre linuxHeaders ed gcc gcc.gcc libsigsegv + paxctl zlib pcre linuxHeaders ed gcc gcc.cc libsigsegv ]; overrides = pkgs: { diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix index 3abffc469269..90f89cc0c784 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix @@ -162,12 +162,12 @@ rec { cp -d ${gnugrep.pcre.crossDrv}/lib/libpcre*.so* $out/lib # needed by grep # Copy what we need of GCC. - cp -d ${gcc.gcc.crossDrv}/bin/gcc $out/bin - cp -d ${gcc.gcc.crossDrv}/bin/cpp $out/bin - cp -d ${gcc.gcc.crossDrv}/bin/g++ $out/bin - cp -d ${gcc.gcc.crossDrv}/lib*/libgcc_s.so* $out/lib - cp -d ${gcc.gcc.crossDrv}/lib*/libstdc++.so* $out/lib - cp -rd ${gcc.gcc.crossDrv}/lib/gcc $out/lib + cp -d ${gcc.cc.crossDrv}/bin/gcc $out/bin + cp -d ${gcc.cc.crossDrv}/bin/cpp $out/bin + cp -d ${gcc.cc.crossDrv}/bin/g++ $out/bin + cp -d ${gcc.cc.crossDrv}/lib*/libgcc_s.so* $out/lib + cp -d ${gcc.cc.crossDrv}/lib*/libstdc++.so* $out/lib + cp -rd ${gcc.cc.crossDrv}/lib/gcc $out/lib chmod -R u+w $out/lib rm -f $out/lib/gcc/*/*/include*/linux rm -f $out/lib/gcc/*/*/include*/sound @@ -175,9 +175,9 @@ rec { rm -f $out/lib/gcc/*/*/include-fixed/asm rm -rf $out/lib/gcc/*/*/plugin #rm -f $out/lib/gcc/*/*/*.a - cp -rd ${gcc.gcc.crossDrv}/libexec/* $out/libexec + cp -rd ${gcc.cc.crossDrv}/libexec/* $out/libexec mkdir $out/include - cp -rd ${gcc.gcc.crossDrv}/include/c++ $out/include + cp -rd ${gcc.cc.crossDrv}/include/c++ $out/include chmod -R u+w $out/include rm -rf $out/include/c++/*/ext/pb_ds rm -rf $out/include/c++/*/ext/parallel diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 767b1f288c0f..16a1d513afe3 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -89,12 +89,12 @@ rec { cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep # Copy what we need of GCC. - cp -d ${gcc.gcc}/bin/gcc $out/bin - cp -d ${gcc.gcc}/bin/cpp $out/bin - cp -d ${gcc.gcc}/bin/g++ $out/bin - cp -d ${gcc.gcc}/lib*/libgcc_s.so* $out/lib - cp -d ${gcc.gcc}/lib*/libstdc++.so* $out/lib - cp -rd ${gcc.gcc}/lib/gcc $out/lib + cp -d ${gcc.cc}/bin/gcc $out/bin + cp -d ${gcc.cc}/bin/cpp $out/bin + cp -d ${gcc.cc}/bin/g++ $out/bin + cp -d ${gcc.cc}/lib*/libgcc_s.so* $out/lib + cp -d ${gcc.cc}/lib*/libstdc++.so* $out/lib + cp -rd ${gcc.cc}/lib/gcc $out/lib chmod -R u+w $out/lib rm -f $out/lib/gcc/*/*/include*/linux rm -f $out/lib/gcc/*/*/include*/sound @@ -102,11 +102,11 @@ rec { rm -f $out/lib/gcc/*/*/include-fixed/asm rm -rf $out/lib/gcc/*/*/plugin #rm -f $out/lib/gcc/*/*/*.a - cp -rd ${gcc.gcc}/libexec/* $out/libexec + cp -rd ${gcc.cc}/libexec/* $out/libexec chmod -R u+w $out/libexec rm -rf $out/libexec/gcc/*/*/plugin mkdir $out/include - cp -rd ${gcc.gcc}/include/c++ $out/include + cp -rd ${gcc.cc}/include/c++ $out/include chmod -R u+w $out/include rm -rf $out/include/c++/*/ext/pb_ds rm -rf $out/include/c++/*/ext/parallel |