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:
parent
ec59bcbf37
commit
5968b490d6
@ -19,12 +19,10 @@ stdenv.mkDerivation {
|
|||||||
installPhase = ''
|
installPhase = ''
|
||||||
ensureDir $out
|
ensureDir $out
|
||||||
cp -R * $out
|
cp -R * $out
|
||||||
cd $out/bin
|
|
||||||
set +e
|
set +e
|
||||||
for a in *; do
|
for a in $out/bin/* ; do
|
||||||
patchelf --interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) \
|
patchelf --interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) \
|
||||||
--set-rpath $(cat $NIX_GCC/nix-support/orig-libc)/lib:$(cat
|
--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
|
||||||
$NIX_GCC/nix-support/orig-gcc) $a
|
|
||||||
done
|
done
|
||||||
set -e
|
set -e
|
||||||
mv $out/bin/gnatgcc_2wrap $out/bin/gnatgcc
|
mv $out/bin/gnatgcc_2wrap $out/bin/gnatgcc
|
||||||
|
Loading…
Reference in New Issue
Block a user