diff options
| author | Shea Levy | 2011-04-04 22:46:43 +0000 |
|---|---|---|
| committer | Shea Levy | 2011-04-04 22:46:43 +0000 |
| commit | d76f7de2dacd902b3ac68206551ba8f4985956a0 (patch) | |
| tree | 47960efcf19253e45164d03ce3cec040634df8ed | |
| parent | 72a9ea5c5ca33610d4850cad40d6660e4aae6b8f (diff) | |
Get gnat to build with C++ support
svn path=/nixpkgs/branches/stdenv-ada/; revision=26687
| -rw-r--r-- | pkgs/development/compilers/gcc-4.6/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc-4.6/builder.sh b/pkgs/development/compilers/gcc-4.6/builder.sh index 0a18a81ac89f..54419ab678be 100644 --- a/pkgs/development/compilers/gcc-4.6/builder.sh +++ b/pkgs/development/compilers/gcc-4.6/builder.sh @@ -9,7 +9,7 @@ mkdir $NIX_FIXINC_DUMMY # 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72c63e4946a8..f08d2a69f8d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1889,7 +1889,7 @@ let gnat45 = wrapGCC (gcc45_real.gcc.override { name = "gnat"; - langCC = false; + langCC = true; langC = true; langAda = true; profiledCompiler = false; |