diff options
Diffstat (limited to 'pkgs/development/compilers/gcc/4.3/default.nix')
-rw-r--r-- | pkgs/development/compilers/gcc/4.3/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix index 4b9fd616d849..d17f9f195150 100644 --- a/pkgs/development/compilers/gcc/4.3/default.nix +++ b/pkgs/development/compilers/gcc/4.3/default.nix @@ -47,9 +47,9 @@ let " --enable-threads=posix" + " --enable-nls" ); - stageNameAddon = if (crossStageStatic) then "-stage-static" else + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else ""; + crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; in stdenv.mkDerivation ({ @@ -76,7 +76,7 @@ stdenv.mkDerivation ({ }); patches = - [./pass-cxxcpp.patch ./libmudflap-cpp.patch] + [ ./pass-cxxcpp.patch ./libmudflap-cpp.patch ./siginfo_t_fix.patch ] ++ optional noSysDirs ./no-sys-dirs.patch ++ optional (noSysDirs && langFortran) ./no-sys-dirs-fortran.patch ++ optional langJava ./java-jvgenmain-link.patch @@ -85,7 +85,7 @@ stdenv.mkDerivation ({ inherit noSysDirs profiledCompiler staticCompiler crossStageStatic binutilsCross libcCross; - targetConfig = if (cross != null) then cross.config else null; + targetConfig = if cross != null then cross.config else null; buildInputs = [texinfo gmp mpfr] ++ (optionals langTreelang [bison flex]) @@ -129,7 +129,7 @@ stdenv.mkDerivation ({ enableMultilib; }; # ghdl does not build fine with parallel building - enableParallelBuilding = if langVhdl then false else true; + enableParallelBuilding = !langVhdl; meta = { homepage = "http://gcc.gnu.org/"; |