diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 19:54:15 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 19:54:15 +0100 |
commit | 84779a6f7da93bd6325f478c62c82cc0a1a2e341 (patch) | |
tree | 554971a930d84656bb952ba0f9a328ef08e70c72 /pkgs/development/compilers/gcc/4.6/default.nix | |
parent | e2d505b24e50e16e3634478d565c7c9988b1d90f (diff) | |
download | nixlib-84779a6f7da93bd6325f478c62c82cc0a1a2e341.tar nixlib-84779a6f7da93bd6325f478c62c82cc0a1a2e341.tar.gz nixlib-84779a6f7da93bd6325f478c62c82cc0a1a2e341.tar.bz2 nixlib-84779a6f7da93bd6325f478c62c82cc0a1a2e341.tar.lz nixlib-84779a6f7da93bd6325f478c62c82cc0a1a2e341.tar.xz nixlib-84779a6f7da93bd6325f478c62c82cc0a1a2e341.tar.zst nixlib-84779a6f7da93bd6325f478c62c82cc0a1a2e341.zip |
Remove unnecessary parentheses around if conditions
Pet peeve...
Diffstat (limited to 'pkgs/development/compilers/gcc/4.6/default.nix')
-rw-r--r-- | pkgs/development/compilers/gcc/4.6/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index d67ee8bef0e9..38c3282b7c4f 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -101,7 +101,7 @@ let version = "4.6.3"; withArch + withCpu + withAbi + - (if (crossMingw && crossStageStatic) then + (if crossMingw && crossStageStatic then " --with-headers=${libcCross}/include" + " --with-gcc" + " --with-gnu-as" + @@ -149,9 +149,9 @@ let version = "4.6.3"; " --enable-nls" + " --disable-decimal-float") # No final libdecnumber (it may work only in 386) ); - 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 ""; bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; @@ -216,7 +216,7 @@ stdenv.mkDerivation ({ # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let - libc = if (libcCross != null) then libcCross else stdenv.gcc.libc; + libc = if libcCross != null then libcCross else stdenv.gcc.libc; in '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h @@ -275,7 +275,7 @@ stdenv.mkDerivation ({ --with-gmp=${gmp} --with-mpfr=${mpfr} --with-mpc=${mpc} - ${if (libelf != null) then "--with-libelf=${libelf}" else ""} + ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib @@ -294,12 +294,12 @@ stdenv.mkDerivation ({ ${ # Trick that should be taken out once we have a mips64el-linux not loongson2f if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""} ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} ${if !bootstrap then "--disable-bootstrap" else ""} "; - targetConfig = if (cross != null) then cross.config else null; + targetConfig = if cross != null then cross.config else null; buildFlags = if bootstrap then (if profiledCompiler then "profiledbootstrap" else "bootstrap") @@ -350,7 +350,7 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} --target=${stdenv.cross.config} ''; |