diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 14:27:57 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 14:27:57 +0200 |
| commit | 0fd9db3cfbae877dcf7a07886c45197386cfef4d (patch) | |
| tree | 847032d7146bd6783340adf99041abdf53e568aa /pkgs | |
| parent | 06fc1ec34dbae8bba4673475e64a8241026089f6 (diff) | |
| download | nixlib-0fd9db3cfbae877dcf7a07886c45197386cfef4d.tar nixlib-0fd9db3cfbae877dcf7a07886c45197386cfef4d.tar.gz nixlib-0fd9db3cfbae877dcf7a07886c45197386cfef4d.tar.bz2 nixlib-0fd9db3cfbae877dcf7a07886c45197386cfef4d.tar.lz nixlib-0fd9db3cfbae877dcf7a07886c45197386cfef4d.tar.xz nixlib-0fd9db3cfbae877dcf7a07886c45197386cfef4d.tar.zst nixlib-0fd9db3cfbae877dcf7a07886c45197386cfef4d.zip | |
gcc-4.8: Get rid of lib64
Having a separate lib64 is bad because it requires special-casing in lots of places. Previously done in e4a11b4d92424c42f61ee55cf505ac1217944f4a, which apparently got lost going from 4.6 to 4.8.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.8/builder.sh | 9 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/development/compilers/gcc/4.8/builder.sh b/pkgs/development/compilers/gcc/4.8/builder.sh index f0f428e4dc51..3d24d34a2f26 100644 --- a/pkgs/development/compilers/gcc/4.8/builder.sh +++ b/pkgs/development/compilers/gcc/4.8/builder.sh @@ -200,6 +200,15 @@ postConfigure() { } +preInstall() { + # Make ‘lib64’ a symlink to ‘lib’. + if [ -n "$is64bit" -a -z "$enableMultilib" ]; then + mkdir -p $out/lib + ln -s lib $out/lib64 + fi +} + + postInstall() { # Remove precompiled headers for now. They are very big and # probably not very useful yet. diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 10d6992ede1c..8865ca7c9550 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -504,6 +504,8 @@ stdenv.mkDerivation ({ inherit enableParallelBuilding; + inherit (stdenv) is64bit; + meta = { homepage = http://gcc.gnu.org/; license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ |