summary refs log tree commit diff
path: root/pkgs/stdenv/generic
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2006-12-27 17:31:55 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2006-12-27 17:31:55 +0000
commit8988c16eeaf43fdcbbcba66ef2f67154eab6b3d5 (patch)
tree48723a7697b94a4fecc7311bea8eb5a1ceaf95fc /pkgs/stdenv/generic
parented8fff32af8ca4c100adfadfbb5931ab2f65e982 (diff)
downloadnixlib-8988c16eeaf43fdcbbcba66ef2f67154eab6b3d5.tar
nixlib-8988c16eeaf43fdcbbcba66ef2f67154eab6b3d5.tar.gz
nixlib-8988c16eeaf43fdcbbcba66ef2f67154eab6b3d5.tar.bz2
nixlib-8988c16eeaf43fdcbbcba66ef2f67154eab6b3d5.tar.lz
nixlib-8988c16eeaf43fdcbbcba66ef2f67154eab6b3d5.tar.xz
nixlib-8988c16eeaf43fdcbbcba66ef2f67154eab6b3d5.tar.zst
nixlib-8988c16eeaf43fdcbbcba66ef2f67154eab6b3d5.zip
* Pass makeFlags to `make check'.
svn path=/nixpkgs/trunk/; revision=7492
Diffstat (limited to 'pkgs/stdenv/generic')
-rw-r--r--pkgs/stdenv/generic/setup-new2.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/setup-new2.sh b/pkgs/stdenv/generic/setup-new2.sh
index 595f0f364905..869f51e4f3db 100644
--- a/pkgs/stdenv/generic/setup-new2.sh
+++ b/pkgs/stdenv/generic/setup-new2.sh
@@ -597,8 +597,10 @@ checkW() {
         checkTarget="check"
     fi
 
-    echo "check flags: $checkFlags ${checkFlagsArray[@]}"
-    make $checkFlags "${checkFlagsArray[@]}" $checkTarget || fail
+    echo "check flags: $makeFlags ${makeFlagsArray[@]} $checkFlags ${checkFlagsArray[@]}"
+    make \
+        $makeFlags ${makeFlagsArray[@]} \
+        $checkFlags "${checkFlagsArray[@]}" $checkTarget || fail
 }