Author: ludo
Date: Fri Sep 10 12:42:37 2010
New Revision: 23719
URL: https://svn.nixos.org/websvn/nix/?rev=23719&sc=1
Log:
glibc: Use the new `buildOutOfSourceTree' option.
Modified:
hydra-config/gnu/trunk/glibc/release.nix
Modified: hydra-config/gnu/trunk/glibc/release.nix
==============================================================================
--- hydra-config/gnu/trunk/glibc/release.nix Fri Sep 10 12:42:33 2010
(r23718)
+++ hydra-config/gnu/trunk/glibc/release.nix Fri Sep 10 12:42:37 2010
(r23719)
@@ -45,13 +45,7 @@
# Build out-of-tree; don't produce self rpaths.
preConfigure =
- ''
- set -x
-
- mkdir ../build
- cd ../build
-
- configureScript="../$sourceRoot/configure"
+ '' set -x
# Glibc cannot have itself in its RPATH.
# See http://sourceware.org/ml/binutils/2009-03/msg00066.html .
@@ -127,6 +121,7 @@
];
buildNativeInputs = (buildInputsFrom pkgs) ++ extraBuildInputs;
+ buildOutOfSourceTree = true;
doCheck = false;
inherit propagatedBuildNativeInputs CPATH preConfigure meta;
}).hostDrv;
@@ -155,7 +150,7 @@
autoconfPhase = "true";
bootstrapBuildInputs = [];
- # Remove absolute paths from `configure' & co.; build out-of-tree.
+ # Remove absolute paths from `configure' & co.
preConfigure =
''
set -x
@@ -177,6 +172,7 @@
mv -v glibc-*.tar.{bz2,gz,xz} "$out/tarballs"
'';
+ buildOutOfSourceTree = true;
inherit meta;
};
@@ -212,6 +208,7 @@
# install".
checkPhase = "make -k check || true";
+ buildOutOfSourceTree = true;
inherit preConfigure meta;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
