Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1308463 - Fix GYP bustage on TC r=me
  • Loading branch information
Tim Taubert committed Oct 22, 2016
1 parent f0c8ae6 commit 403b832
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion automation/taskcluster/scripts/build_gyp.sh
Expand Up @@ -11,7 +11,7 @@ fi
hg_clone https://hg.mozilla.org/projects/nspr nspr default

# Build.
cd nss && NSS_GYP_GEN=1 ./build.sh
cd nss && ./build.sh -g
if [ $? != 0 ]; then
exit 1
fi
Expand Down
4 changes: 2 additions & 2 deletions build.sh
Expand Up @@ -10,10 +10,10 @@
set -e

CWD=$(cd $(dirname $0); pwd -P)
OBJ_DIR=$(make -C $CWD platform)
OBJ_DIR=$(make platform)
DIST_DIR="$CWD/../dist/$OBJ_DIR"

if [ -n $CCC ] && [ -z $CXX ]; then
if [ -n "$CCC" ] && [ -z "$CXX" ]; then
export CXX="$CCC"
fi

Expand Down

0 comments on commit 403b832

Please sign in to comment.