Bug 1309505 - Bustage fix for recursive make, a=bustage
authorMartin Thomson <martin.thomson@gmail.com>
Mon, 24 Oct 2016 22:49:07 +1100
changeset 12751 cbeabbf0fb44ae6341996a91d51d20ccf53b5ff0
parent 12750 a1d2234bed689864b7b0007e5d422f2aef89f453
child 12752 eb5f08064c096a888dbfd67828e5c8aaa99c9f7f
push id1693
push usermartin.thomson@gmail.com
push dateMon, 24 Oct 2016 11:49:18 +0000
reviewersbustage
bugs1309505
Bug 1309505 - Bustage fix for recursive make, a=bustage
build.sh
--- a/build.sh
+++ b/build.sh
@@ -6,17 +6,17 @@
 #
 # -c = clean before build
 # -g = force a rebuild of gyp (and NSPR, because why not)
 # -v = verbose build
 
 set -e
 
 CWD=$(cd $(dirname $0); pwd -P)
-OBJ_DIR=$(cd "$CWD";make platform)
+OBJ_DIR=$(make -s -C "$CWD" platform)
 DIST_DIR="$CWD/../dist/$OBJ_DIR"
 
 if [ -n "$CCC" ] && [ -z "$CXX" ]; then
     export CXX="$CCC"
 fi
 
 while [ $# -gt 0 ]; do
     case $1 in