Fix some buildbot warnings about jobserver mode if $MAKE had a -j2, etc.
This commit is contained in:
parent
f8ed5c6f7e
commit
ffdc55f1e5
|
@ -45,10 +45,8 @@ if [ -z "$MAKE" ]; then
|
|||
fi
|
||||
|
||||
echo "\$MAKE is '$MAKE'"
|
||||
|
||||
# Unset $MAKE so submakes don't use it.
|
||||
MAKECOMMAND="$MAKE"
|
||||
unset MAKE
|
||||
MAKECMD="$MAKE"
|
||||
unset MAKE # prevent warnings about jobserver mode.
|
||||
|
||||
set -x
|
||||
set -e
|
||||
|
@ -74,7 +72,7 @@ PATH="$CHECKERDIR/bin:$PATH" scan-build -o analysis cmake -Wno-dev -DPHYSFS_BUIL
|
|||
#CC="$CHECKERDIR/libexec/ccc-analyzer" CFLAGS="-O0 -Wno-deprecated-declarations" LDFLAGS="-Wno-liblto" ../configure --enable-assertions=enabled
|
||||
|
||||
rm -rf analysis
|
||||
PATH="$CHECKERDIR/bin:$PATH" scan-build -o analysis $MAKECOMMAND
|
||||
PATH="$CHECKERDIR/bin:$PATH" scan-build -o analysis $MAKECMD
|
||||
|
||||
if [ `ls -A analysis |wc -l` == 0 ] ; then
|
||||
mkdir analysis/zarro
|
||||
|
|
|
@ -43,6 +43,8 @@ if [ -z "$MAKE" ]; then
|
|||
fi
|
||||
|
||||
echo "\$MAKE is '$MAKE'"
|
||||
MAKECMD="$MAKE"
|
||||
unset MAKE # prevent warnings about jobserver mode.
|
||||
|
||||
echo "Setting up Emscripten SDK environment..."
|
||||
source "$ENVSCRIPT"
|
||||
|
@ -58,7 +60,7 @@ echo "Configuring..."
|
|||
emcmake cmake -G "Unix Makefiles" -DPHYSFS_BUILD_SHARED=False -DCMAKE_BUILD_TYPE=MinSizeRel .. || exit $?
|
||||
|
||||
echo "Building..."
|
||||
emmake $MAKE || exit $?
|
||||
emmake $MAKECMD || exit $?
|
||||
|
||||
set -e
|
||||
rm -rf "$TARBALL" physfs-emscripten
|
||||
|
|
|
@ -28,6 +28,10 @@ if [ "x$MAKE" == "x" ]; then
|
|||
MAKE="make -j$NCPU"
|
||||
fi
|
||||
|
||||
echo "\$MAKE is '$MAKE'"
|
||||
MAKECMD="$MAKE"
|
||||
unset MAKE # prevent warnings about jobserver mode.
|
||||
|
||||
BUILDBOTDIR="raspberrypi-buildbot"
|
||||
PARENTDIR="$PWD"
|
||||
|
||||
|
@ -51,7 +55,7 @@ cmake -G "Unix Makefiles" \
|
|||
-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
|
||||
..
|
||||
|
||||
$MAKE
|
||||
$MAKECMD
|
||||
|
||||
rm -rf "$TARBALL" physfs-raspberrypi
|
||||
mkdir -p physfs-raspberrypi
|
||||
|
|
Loading…
Reference in New Issue