JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gcc: Don't symlink lib and lib64 when building multilib

Browse Source
This commit is contained in:
Shea Levy 2013-02-16 18:54:47 -05:00
parent 0489661dd1
commit f081cacda7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/4.6/builder.sh
View File

@ -198,7 +198,7 @@ postConfigure() {
preInstall() { preInstall() {
# Make ‘lib64’ a symlink to ‘lib’. # Make ‘lib64’ a symlink to ‘lib’.
if [ -n "$is64bit" ]; then if [ -n "$is64bit" -a -z "$enableMultilib" ]; then
mkdir -p $out/lib mkdir -p $out/lib
ln -s lib $out/lib64 ln -s lib $out/lib64
fi fi

4
pkgs/development/compilers/gcc/4.6/default.nix
View File

@ -192,7 +192,7 @@ stdenv.mkDerivation ({
inherit langC langCC langFortran langJava langAda langGo; inherit langC langCC langFortran langJava langAda langGo;
}; };
inherit patches; inherit patches enableMultilib;
postPatch = postPatch =
if (stdenv.isGNU if (stdenv.isGNU
@ -431,7 +431,7 @@ stdenv.mkDerivation ({
else null; else null;
passthru = { inherit langC langCC langAda langFortran langVhdl passthru = { inherit langC langCC langAda langFortran langVhdl
langGo enableMultilib version; }; langGo version; };
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/top-level/all-packages.nix
View File

@ -2133,7 +2133,7 @@ let
gcc46_multi = if system == "x86_64-linux" then lowPrio ( gcc46_multi = if system == "x86_64-linux" then lowPrio (
wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.gcc.override { wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.gcc.override {
stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc); stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc);
profiledCompiler = false; profiledCompiler = false;
enableMultilib = true; enableMultilib = true;
})) else throw "Multilib gcc not supported on this system"; })) else throw "Multilib gcc not supported on this system";