diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:49:00 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-22 12:03:12 +0200 |
commit | 70cecb9cbdc7684885e348e2e82308f8da373953 (patch) | |
tree | bb0e5268662a1ce893c2d1adc554d461bbc85563 /pkgs/development/compilers | |
parent | b8b898fbee6ed60ccd3951fbb8eeab028f5d2c4d (diff) |
gcc: fix #15033: avoid lib64/ symlink to 32-bit lib/
This was caused by me in 90ee003240.
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/gcc/builder.sh | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 5b206a63daa1..22107e72ef70 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -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 |