public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename occurrences of gcc.gcc to gcc.cc

Browse Source
This commit is contained in:
Eric Seidel
2015-01-14 20:47:49 -08:00
parent f3c6827373
commit 88eae46455
17 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/linux/default.nix
+1 -1
View File
@@ -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: {
pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
+8 -8
View File
@@ -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
pkgs/stdenv/linux/make-bootstrap-tools.nix
+8 -8
View File
@@ -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