diff options
| author | Shea Levy <shea@shealevy.com> | 2013-02-16 18:54:47 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2013-02-16 18:54:47 -0500 |
| commit | f081cacda7b8494301401120b9e649cf23b309eb (patch) | |
| tree | e183a21d27629b362f33cd124c5d6eef703bddb4 /pkgs/development/compilers | |
| parent | 0489661dd19f028a3f9e53cb25a685977248d231 (diff) | |
| download | nixlib-f081cacda7b8494301401120b9e649cf23b309eb.tar nixlib-f081cacda7b8494301401120b9e649cf23b309eb.tar.gz nixlib-f081cacda7b8494301401120b9e649cf23b309eb.tar.bz2 nixlib-f081cacda7b8494301401120b9e649cf23b309eb.tar.lz nixlib-f081cacda7b8494301401120b9e649cf23b309eb.tar.xz nixlib-f081cacda7b8494301401120b9e649cf23b309eb.tar.zst nixlib-f081cacda7b8494301401120b9e649cf23b309eb.zip | |
gcc: Don't symlink lib and lib64 when building multilib
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.6/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/4.6/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh index 2bb185417390..bdf15be5a996 100644 --- a/pkgs/development/compilers/gcc/4.6/builder.sh +++ b/pkgs/development/compilers/gcc/4.6/builder.sh @@ -198,7 +198,7 @@ postConfigure() { preInstall() { # Make ‘lib64’ a symlink to ‘lib’. - if [ -n "$is64bit" ]; then + if [ -n "$is64bit" -a -z "$enableMultilib" ]; then mkdir -p $out/lib ln -s lib $out/lib64 fi diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index dc5c32bde8f8..d95e161ba238 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -192,7 +192,7 @@ stdenv.mkDerivation ({ inherit langC langCC langFortran langJava langAda langGo; }; - inherit patches; + inherit patches enableMultilib; postPatch = if (stdenv.isGNU @@ -431,7 +431,7 @@ stdenv.mkDerivation ({ else null; passthru = { inherit langC langCC langAda langFortran langVhdl - langGo enableMultilib version; }; + langGo version; }; enableParallelBuilding = true; |