Author: shlevy
Date: Sat Apr 2 19:13:36 2011
New Revision: 26671
URL: https://svn.nixos.org/websvn/nix/?rev=26671&sc=1
Log:
Use g++ -E as the C++ preprocessor
The problem with gnat46 not building was because gnatboot replaces the stdenv
gcc with the gnat45 gcc, so calling g++ directly as the C++ preprocessor fixes
this.
Modified:
nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/builder.sh
nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/builder.sh
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/builder.sh Sat Apr 2
18:04:04 2011 (r26670)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/builder.sh Sat Apr 2
19:13:36 2011 (r26671)
@@ -8,9 +8,7 @@
# 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"
Modified: nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix Sat Apr
2 18:04:04 2011 (r26670)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix Sat Apr
2 19:13:36 2011 (r26671)
@@ -200,7 +200,7 @@
else null;
inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic
- libcCross crossMingw langCC;
+ libcCross crossMingw;
buildNativeInputs = [ texinfo which ]
++ optional (perl != null) perl;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
