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
This commit is contained in:
Lluís Batlle i Rossell 2010-01-18 23:28:58 +00:00
parent ec59bcbf37
commit 5968b490d6

View file

@ -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