diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-12-21 08:03:30 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-12-21 08:03:30 +0000 |
| commit | 8a0a76f5e6e7223af269cb3543205e115ac993bb (patch) | |
| tree | 88486fdc51ee73a971d4c31b95bd76f6f68307d1 /pkgs/build-support | |
| parent | 7ab9bff48aab6baf3c3f601f25ba29a0ddbb13be (diff) | |
In a recent commit I made references to path out of the svn tree, which
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
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/gnat-wrapper/builder.sh | 5 | ||||
| -rw-r--r-- | pkgs/build-support/gnat-wrapper/gnatlink-wrapper.sh | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/build-support/gnat-wrapper/builder.sh b/pkgs/build-support/gnat-wrapper/builder.sh index 9befd517439da..e416766db66f4 100644 --- a/pkgs/build-support/gnat-wrapper/builder.sh +++ b/pkgs/build-support/gnat-wrapper/builder.sh @@ -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" diff --git a/pkgs/build-support/gnat-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/gnat-wrapper/gnatlink-wrapper.sh index 850ba0f83480e..25907108b4db1 100644 --- a/pkgs/build-support/gnat-wrapper/gnatlink-wrapper.sh +++ b/pkgs/build-support/gnat-wrapper/gnatlink-wrapper.sh @@ -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 |