diff options
Diffstat (limited to 'pkgs/development/compilers/gcc/4.8/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 38180990b83d..aa3bfa09d72f 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -306,9 +306,7 @@ stdenv.mkDerivation ({ ''} ''; - # 'iant' at #go-nuts@freenode, gccgo maintainer, said that - # they have a bug in 4.7.1 if adding "--disable-static" - dontDisableStatic = langGo || staticCompiler; + dontDisableStatic = true; configureFlags = " ${if stdenv.isSunOS then @@ -317,7 +315,7 @@ stdenv.mkDerivation ({ " --with-gnu-as --without-gnu-ld " else ""} --enable-lto - ${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 "--disable-plugin"} ${if ppl != null then "--with-ppl=${ppl} --disable-ppl-version-check" else ""} @@ -339,6 +337,7 @@ stdenv.mkDerivation ({ --disable-libstdcxx-pch --without-included-gettext --with-system-zlib + --enable-static --enable-languages=${ concatStrings (intersperse "," ( optional langC "c" |