From e01be47e532ba8f8426bb676619079fcea1668f1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 5 Apr 2009 18:13:59 +0000
Subject: * aclocal wrapper: skip directories in ACLOCAL_PATH that don't exist,
   otherwise aclocal barfs.  Updated the builder to use makeWrapper * Made
 Automake 1.10 the default. * Fixed `make check' in Automake by turning off
 indented logging in   Make (there is a flag for that now). * Disabled the
 `make check' in Automake by default because it takes a   REALLY long time
 (e.g. more than 2 hours on Cygwin, 50 minutes on   Darwin, 25 minutes on
 Linux) which is a lot for a package that   otherwise takes 10 seconds to
 build.  We can add a Hydra job with   doCheck enabled to do regression
 testing. * make-wrapper: allow --run commands to add additional flags to the 
  invocation of the wrapped program.  An example is the aclocal   wrapper: it
 adds additional -I ... flags. * make-wrapper: call the wrapped program
 .foo-wrapped instead of   .wrapped-foo to make it easier to tell programs
 apart in `ps'   output.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14885
---
 pkgs/build-support/make-wrapper/make-wrapper.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'pkgs/build-support/make-wrapper/make-wrapper.sh')

diff --git a/pkgs/build-support/make-wrapper/make-wrapper.sh b/pkgs/build-support/make-wrapper/make-wrapper.sh
index c13f623bcda..461f30780ee 100644
--- a/pkgs/build-support/make-wrapper/make-wrapper.sh
+++ b/pkgs/build-support/make-wrapper/make-wrapper.sh
@@ -66,7 +66,9 @@ makeWrapper() {
         fi
     done
 
-    echo "exec \"$original\" $flagsBefore \"\$@\"" >> $wrapper
+    # Note: extraFlagsArray is an array containing additional flags
+    # that may be set by --run actions.
+    echo exec "$original" $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper
     
     chmod +x $wrapper
 }
@@ -90,7 +92,7 @@ filterExisting() {
 # Syntax: wrapProgram <PROGRAM> <MAKE-WRAPPER FLAGS...>
 wrapProgram() {
     local prog="$1"
-    local hidden="$(dirname "$prog")/.wrapped-$(basename "$prog")"
+    local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
     mv $prog $hidden
     makeWrapper $hidden $prog "$@"
 }
-- 
cgit 1.4.1