Commit 4ad9a97e authored by John Ericson's avatar John Ericson
Browse files

gcc: Don't let solaris hack pollute CC elsehwere

parent 0f5c8046

pkgs/development/compilers/gcc/4.8/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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.

pkgs/development/compilers/gcc/4.9/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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.

pkgs/development/compilers/gcc/5/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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.

pkgs/development/compilers/gcc/6/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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.

pkgs/development/compilers/gcc/7/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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.