diff --git a/pkgs/development/compilers/gcc-4.6/builder.sh b/pkgs/development/compilers/gcc-4.6/builder.sh index 0a18a81ac89..af42039310a 100644 --- a/pkgs/development/compilers/gcc-4.6/builder.sh +++ b/pkgs/development/compilers/gcc-4.6/builder.sh @@ -8,9 +8,7 @@ mkdir $NIX_FIXINC_DUMMY # libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad # Thing. export CPP="gcc -E" -if test "$langCC" = "1"; then - export CXXCPP="gcc -E" #We only want this if C++ is enabled -fi +export CXXCPP="g++ -E" if test "$staticCompiler" = "1"; then EXTRA_LDFLAGS="-static" diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index bfa54f6e0d7..827540b9cab 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -200,7 +200,7 @@ stdenv.mkDerivation ({ else null; inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic - libcCross crossMingw langCC; + libcCross crossMingw; buildNativeInputs = [ texinfo which ] ++ optional (perl != null) perl;