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

* Indentation fixes. 

svn path=/nixpkgs/branches/stdenv-updates/; revision=22961
This commit is contained in:
Eelco Dolstra 2010-08-05 13:21:29 +00:00
parent e0a11f532b
commit 6fe628b99a
2 changed files with 61 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/compilers/gcc-4.5/default.nix
View File

@ -183,6 +183,7 @@ stdenv.mkDerivation ({
buildNativeInputs = [ texinfo which ] buildNativeInputs = [ texinfo which ]
++ optional (perl != null) perl; ++ optional (perl != null) perl;
buildInputs = [ gmp mpfr mpc libelf gettext ] buildInputs = [ gmp mpfr mpc libelf gettext ]
++ (optional (ppl != null) ppl) ++ (optional (ppl != null) ppl)
++ (optional (cloogppl != null) cloogppl) ++ (optional (cloogppl != null) cloogppl)
@ -254,7 +255,7 @@ stdenv.mkDerivation ({
# If we are making a cross compiler, cross != null # If we are making a cross compiler, cross != null
NIX_GCC_CROSS = if cross == null then "${stdenv.gccCross}" else ""; NIX_GCC_CROSS = if cross == null then "${stdenv.gccCross}" else "";
dontStrip = true; dontStrip = true;
configureFlags = " configureFlags = ''
${if enableMultilib then "" else "--disable-multilib"} ${if enableMultilib then "" else "--disable-multilib"}
${if enableShared then "" else "--disable-shared"} ${if enableShared then "" else "--disable-shared"}
${if ppl != null then "--with-ppl=${ppl.hostDrv}" else ""} ${if ppl != null then "--with-ppl=${ppl.hostDrv}" else ""}
@ -283,7 +284,7 @@ stdenv.mkDerivation ({
${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 cross != null then crossConfigureFlags else ""}
--target=${stdenv.cross.config} --target=${stdenv.cross.config}
"; '';
}; };
@ -368,11 +369,13 @@ stdenv.mkDerivation ({
platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false) [ "i686-darwin" ]; platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false) [ "i686-darwin" ];
}; };
} }
// (if cross != null && cross.libc == "msvcrt" && crossStageStatic then rec {
// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
makeFlags = [ "all-gcc" "all-target-libgcc" ]; makeFlags = [ "all-gcc" "all-target-libgcc" ];
installTargets = "install-gcc install-target-libgcc"; installTargets = "install-gcc install-target-libgcc";
} else {}) }
// (if langVhdl then rec {
// optionalAttrs langVhdl rec {
name = "ghdl-0.29"; name = "ghdl-0.29";
ghdlSrc = fetchurl { ghdlSrc = fetchurl {
@ -405,4 +408,4 @@ stdenv.mkDerivation ({
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
}; };
} else {})) })

7
pkgs/development/libraries/cloog-ppl/default.nix
View File

@ -1,13 +1,16 @@
{ fetchurl, stdenv, ppl, static ? false }: { fetchurl, stdenv, ppl, static ? false }:
let let
# --with-host-libstdcxx helps when *ppl* is built statically. # --with-host-libstdcxx helps when *ppl* is built statically.
# But I will suppose that this is statically built only when ppl is also # But I will suppose that this is statically built only when ppl is also
# statically built. # statically built.
staticFlags = assert static -> ppl.dontDisableStatic == true; staticFlags =
assert static -> ppl.dontDisableStatic == true;
if static then " --enable-static --disable-shared --with-host-libstdcxx=-lstdc++" else ""; if static then " --enable-static --disable-shared --with-host-libstdcxx=-lstdc++" else "";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cloog-ppl-0.15.9"; name = "cloog-ppl-0.15.9";