mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 06:31:02 +00:00
Add multilib gcc-4.6.
libquadmath seems to require that the bootstrap gcc be multilib too.
This commit is contained in:
parent
265fea5788
commit
86feda1106
|
@ -251,7 +251,7 @@ stdenv.mkDerivation ({
|
|||
[ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ];
|
||||
|
||||
configureFlags = "
|
||||
${if enableMultilib then "" else "--disable-multilib"}
|
||||
${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}
|
||||
${if enableShared then "" else "--disable-shared"}
|
||||
${if enablePlugin then "--enable-plugin" else ""}
|
||||
${if ppl != null then "--with-ppl=${ppl}" else ""}
|
||||
|
|
|
@ -2135,6 +2135,12 @@ let
|
|||
binutilsCross = null;
|
||||
}));
|
||||
|
||||
gcc46_multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.gcc.override {
|
||||
stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc);
|
||||
profiledCompiler = false;
|
||||
enableMultilib = true;
|
||||
}));
|
||||
|
||||
gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 {
|
||||
inherit noSysDirs;
|
||||
# I'm not sure if profiling with enableParallelBuilding helps a lot.
|
||||
|
|
Loading…
Reference in a new issue