Author: shlevy
Date: Mon Apr 4 22:46:43 2011
New Revision: 26687
URL: https://svn.nixos.org/websvn/nix/?rev=26687&sc=1
Log:
Get gnat to build with C++ support
Modified:
nixpkgs/branches/stdenv-ada/pkgs/development/compilers/gcc-4.6/builder.sh
nixpkgs/branches/stdenv-ada/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-ada/pkgs/development/compilers/gcc-4.6/builder.sh
==============================================================================
--- nixpkgs/branches/stdenv-ada/pkgs/development/compilers/gcc-4.6/builder.sh
Mon Apr 4 18:50:39 2011 (r26686)
+++ nixpkgs/branches/stdenv-ada/pkgs/development/compilers/gcc-4.6/builder.sh
Mon Apr 4 22:46:43 2011 (r26687)
@@ -9,7 +9,7 @@
# Thing.
export CPP="gcc -E"
if test "$langCC" = "1"; then
- export CXXCPP="gcc -E" #We only want this if C++ is enabled
+ export CXXCPP="g++ -E" #We only want this if C++ is enabled
fi
if test "$staticCompiler" = "1"; then
Modified: nixpkgs/branches/stdenv-ada/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-ada/pkgs/top-level/all-packages.nix Mon Apr 4
18:50:39 2011 (r26686)
+++ nixpkgs/branches/stdenv-ada/pkgs/top-level/all-packages.nix Mon Apr 4
22:46:43 2011 (r26687)
@@ -1889,7 +1889,7 @@
gnat45 = wrapGCC (gcc45_real.gcc.override {
name = "gnat";
- langCC = false;
+ langCC = true;
langC = true;
langAda = true;
profiledCompiler = false;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
