mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 21:21:06 +00:00
Code Issues Wiki Activity

gcc: fix #15033: avoid lib64/ symlink to 32-bit lib/

Browse source 
This was caused by me in 90ee003240.
This commit is contained in:
Vladimír Čunát 2016-05-19 10:49:00 +02:00
parent b8b898fbee
commit 70cecb9cbd
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/compilers/gcc/builder.sh
View file

@ -201,23 +201,20 @@ postConfigure() {
preInstall() {
# Make ‘lib64’ a symlink to ‘lib’.
# Make ‘lib64’ symlinks to ‘lib’.
if [ -n "$is64bit" -a -z "$enableMultilib" ]; then
mkdir -p $out/lib
ln -s lib $out/lib64
mkdir -p "$out/lib"
ln -s lib "$out/lib64"
mkdir -p "$lib/lib"
ln -s lib "$lib/lib64"
fi
}
postInstall() {
mkdir -p "$lib" # some configs don't have anything to put into $lib
# Move runtime libraries to $lib.
moveToOutput "lib/lib*.so*" "$lib"
moveToOutput "lib/lib*.la" "$lib"
if [ -d "$lib/lib" ]; then
ln -s lib "$lib/lib64" # for *.la
fi
moveToOutput "share/gcc-*/python" "$lib"
for i in "$lib"/lib/*.{la,py}; do