diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-28 18:37:11 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-30 22:04:22 -0500 |
| commit | 4ad9a97e9678c70ca974c43fe3ef27f0e65af15a (patch) | |
| tree | e4d44b279775ad880133353d1db0418c0328354f | |
| parent | 0f5c80463176f7b146e8ef1943a3bbd61d4cbaf0 (diff) | |
| download | nixlib-4ad9a97e9678c70ca974c43fe3ef27f0e65af15a.tar nixlib-4ad9a97e9678c70ca974c43fe3ef27f0e65af15a.tar.gz nixlib-4ad9a97e9678c70ca974c43fe3ef27f0e65af15a.tar.bz2 nixlib-4ad9a97e9678c70ca974c43fe3ef27f0e65af15a.tar.lz nixlib-4ad9a97e9678c70ca974c43fe3ef27f0e65af15a.tar.xz nixlib-4ad9a97e9678c70ca974c43fe3ef27f0e65af15a.tar.zst nixlib-4ad9a97e9678c70ca974c43fe3ef27f0e65af15a.zip | |
gcc: Don't let solaris hack pollute CC elsehwere
| -rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/4.9/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/7/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/snapshot/default.nix | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index a55820d7e13d..91daeadba707 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -399,7 +399,7 @@ stdenv.mkDerivation ({ }; # 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 # library headers and binaries, regarless of the language being compiled. diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 6bb1f35bd99f..844e0a7bebf4 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -407,7 +407,7 @@ stdenv.mkDerivation ({ }; # 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 # library headers and binaries, regarless of the language being compiled. diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 64922d83b508..148409bee9bf 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -412,7 +412,7 @@ stdenv.mkDerivation ({ }; # 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 # library headers and binaries, regarless of the language being compiled. diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 00f6cf8ab272..c6114b7e6395 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -414,7 +414,7 @@ stdenv.mkDerivation ({ }; # 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 # library headers and binaries, regarless of the language being compiled. diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 5016735b56c5..c20546b59e8e 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -408,7 +408,7 @@ stdenv.mkDerivation ({ }; # 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 # library headers and binaries, regarless of the language being compiled. diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 0b25d113b5ae..c571487361b2 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -395,7 +395,7 @@ stdenv.mkDerivation ({ }; # 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 # library headers and binaries, regarless of the language being compiled. |