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

gcc: Don't let solaris hack pollute CC elsehwere

Browse Source
This commit is contained in:
John Ericson 2017-11-28 18:37:11 -05:00
parent 0f5c804631
commit 4ad9a97e96
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/4.8/default.nix
View File

@ -399,7 +399,7 @@ stdenv.mkDerivation ({
}; };
# http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
# library headers and binaries, regarless of the language being compiled. # library headers and binaries, regarless of the language being compiled.

2
pkgs/development/compilers/gcc/4.9/default.nix
View File

@ -407,7 +407,7 @@ stdenv.mkDerivation ({
}; };
# http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
# library headers and binaries, regarless of the language being compiled. # library headers and binaries, regarless of the language being compiled.

2
pkgs/development/compilers/gcc/5/default.nix
View File

@ -412,7 +412,7 @@ stdenv.mkDerivation ({
}; };
# http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
# library headers and binaries, regarless of the language being compiled. # library headers and binaries, regarless of the language being compiled.

2
pkgs/development/compilers/gcc/6/default.nix
View File

@ -414,7 +414,7 @@ stdenv.mkDerivation ({
}; };
# http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
# library headers and binaries, regarless of the language being compiled. # library headers and binaries, regarless of the language being compiled.

2
pkgs/development/compilers/gcc/7/default.nix
View File

@ -408,7 +408,7 @@ stdenv.mkDerivation ({
}; };
# http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
# library headers and binaries, regarless of the language being compiled. # library headers and binaries, regarless of the language being compiled.

2
pkgs/development/compilers/gcc/snapshot/default.nix
View File

@ -395,7 +395,7 @@ stdenv.mkDerivation ({
}; };
# http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
CC = if hostPlatform.system == "x86_64-solaris" then "gcc -m64" else "gcc"; ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
# library headers and binaries, regarless of the language being compiled. # library headers and binaries, regarless of the language being compiled.