From 22b5d9c9a5736b4fac7ddfb33a24c3481920fa4f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Aug 2012 23:13:41 +0200 Subject: build-system/gnu: Add `out-of-source?' keyword parameter. * guix/build/gnu-build-system.scm (configure): Add an `out-of-source?' keyword parameter; build out-of-source-tree when #t. * guix/build-system/gnu.scm (gnu-build): Add `out-of-source?' keyword parameter. Pass it in BUILDER. --- guix/build/gnu-build-system.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'guix/build') diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 72f9536ae8..5cc3629e27 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -74,7 +74,8 @@ (append patch-flags (list p))))) patches)) -(define* (configure #:key outputs (configure-flags '()) #:allow-other-keys) +(define* (configure #:key outputs (configure-flags '()) out-of-source? + #:allow-other-keys) (let* ((prefix (assoc-ref outputs "out")) (libdir (assoc-ref outputs "lib")) (includedir (assoc-ref outputs "include")) @@ -90,9 +91,18 @@ (list (string-append "--includedir=" includedir "/include")) '()) - ,@configure-flags))) + ,@configure-flags)) + (srcdir (getcwd))) + (format #t "source directory: ~s~%" srcdir) + (if out-of-source? + (begin + (mkdir "../build") + (chdir "../build"))) + (format #t "build directory: ~s~%" (getcwd)) (format #t "configure flags: ~s~%" flags) - (zero? (apply system* "./configure" flags)))) + (zero? (apply system* + (string-append (if out-of-source? srcdir ".") "/configure") + flags)))) (define* (build #:key (make-flags '()) (parallel-build? #t) #:allow-other-keys) -- cgit v1.2.3