diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:37:04 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:58:40 +0200 |
| commit | e4832c754114c5660909546ac749475bf63ff06e (patch) | |
| tree | fe77400566603caa218453ad5c7b6b9b5ea9715c /pkgs/development/compilers/gcc/builder.sh | |
| parent | 60a890e35bc94ace092a2ec278534979fe6ee361 (diff) | |
| parent | dc13593b9fad3ea3728e2fd32f90841d5ec7662d (diff) | |
| download | nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.gz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.bz2 nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.lz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.xz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.zst nixlib-e4832c754114c5660909546ac749475bf63ff06e.zip | |
Merge branch 'staging'
Includes a security update of libxml2.
Diffstat (limited to 'pkgs/development/compilers/gcc/builder.sh')
| -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 |