JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In a recent commit I made references to path out of the svn tree, which

Browse Source 
broke the evaluation of nixpkgs.
I also tried to make the gnat wrapper friendly to any gnat installation, not
only gnatboot.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19062
This commit is contained in:
Lluís Batlle i Rossell 2009-12-21 08:03:30 +00:00
parent 7ab9bff48a
commit 8a0a76f5e6
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/build-support/gnat-wrapper/builder.sh
View File

@ -51,10 +51,11 @@ else
if test -e "$gcc/lib64"; then
gccCFlags="$gccCFlags -B$gcc/lib64"
fi
gccCFlags="$gccCFlags -B$gcc/lib/gnatgcc/x86_64-pc-linux-gnu/4.1/ -I$gcc/lib/gnatgcc/x86_64-pc-linux-gnu/4.1/adainclude"
basePath=`echo $gcc/lib/*/*/*`
gccCFlags="$gccCFlags -B$basePath -I$basePath/adainclude"
echo "$gccCFlags" > $out/nix-support/gcc-cflags
gnatCFlags="-aI$gcc/lib/gnatgcc/x86_64-pc-linux-gnu/4.1/adainclude -aO$gcc/lib/gnatgcc/x86_64-pc-linux-gnu/4.1/adalib"
gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib"
echo "$gnatCFlags" > $out/nix-support/gnat-cflags
gccPath="$gcc/bin"

2
pkgs/build-support/gnat-wrapper/gnatlink-wrapper.sh
View File

@ -1,7 +1,7 @@
#! @shell@ -e
# Add the flags for the GNAT compiler proper.
extraAfter="--GCC=@out@/bin/gnatgcc"
extraAfter="--GCC=@out@/bin/gcc"
extraBefore=()
# Add the flags that should be passed to the linker (and prevent

13
pkgs/top-level/all-packages.nix
View File

@ -1852,13 +1852,6 @@ let
profiledCompiler = true;
}));
gcc44_real2 = lowPrio (wrapGCC (makeOverridable (import
../development/compilers/gcc-4.4-copy) {
inherit fetchurl stdenv texinfo gmp mpfr ppl cloogppl
gettext which noSysDirs;
profiledCompiler = true;
}));
gccApple =
wrapGCC ( (if stdenv.system == "i686-darwin" then import ../development/compilers/gcc-apple else import ../development/compilers/gcc-apple64) {
inherit fetchurl stdenv noSysDirs;
@ -1929,7 +1922,7 @@ let
gnat = gnat44;
gnat44 = wrapGNAT (gcc44_real2.gcc.override {
gnat44 = wrapGNAT (gcc44_real.gcc.override {
name = "gnat";
langCC = false;
langC = true;
@ -8310,8 +8303,8 @@ let
};
ghdl = import ../applications/science/electronics/ghdl {
inherit fetchurl stdenv;
gnat = gnatboot;
inherit fetchurl stdenv gnat;
gccSrc = gcc43.gcc.src;
};
### SCIENCE / MATH