diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-01-18 23:28:58 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-01-18 23:28:58 +0000 |
| commit | 5968b490d66e2a6d0e1f06fd7d7c9492decc98f3 (patch) | |
| tree | 5c587c1c6ddcf73440493038ec96937607c4648f /pkgs/development/compilers/gnatboot | |
| parent | ec59bcbf370c43892f9a9f6e121f35ee1815a118 (diff) | |
| download | nixlib-5968b490d66e2a6d0e1f06fd7d7c9492decc98f3.tar nixlib-5968b490d66e2a6d0e1f06fd7d7c9492decc98f3.tar.gz nixlib-5968b490d66e2a6d0e1f06fd7d7c9492decc98f3.tar.bz2 nixlib-5968b490d66e2a6d0e1f06fd7d7c9492decc98f3.tar.lz nixlib-5968b490d66e2a6d0e1f06fd7d7c9492decc98f3.tar.xz nixlib-5968b490d66e2a6d0e1f06fd7d7c9492decc98f3.tar.zst nixlib-5968b490d66e2a6d0e1f06fd7d7c9492decc98f3.zip | |
The fix in r19516 made evident an error in the gnatboot expression, about
library paths. Fixing this, to get gnat properly built. svn path=/nixpkgs/branches/stdenv-updates/; revision=19531
Diffstat (limited to 'pkgs/development/compilers/gnatboot')
| -rw-r--r-- | pkgs/development/compilers/gnatboot/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index 1637cf5f927d..954fb6bf594f 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -19,12 +19,10 @@ stdenv.mkDerivation { installPhase = '' ensureDir $out cp -R * $out - cd $out/bin set +e - for a in *; do + for a in $out/bin/* ; do patchelf --interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) \ - --set-rpath $(cat $NIX_GCC/nix-support/orig-libc)/lib:$(cat - $NIX_GCC/nix-support/orig-gcc) $a + --set-rpath $(cat $NIX_GCC/nix-support/orig-libc)/lib:$(cat $NIX_GCC/nix-support/orig-gcc)/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib $a done set -e mv $out/bin/gnatgcc_2wrap $out/bin/gnatgcc |