Ignore set but empty CORES variable

Change the behavior when the CORES environment variable
is set and empty.
Now `-j` will not be added to make/ninja.
This commit is contained in:
Norbert Lange authored and Martin Storsjö committed 2023-09-27 22:53:01 +03:00
1 parent 2bfe3e7c48
commit 97cd12a63a
5 files changed
+5 -5

No files matched your search

+1 -1
View File
@@ -123,7 +123,7 @@ for arch in $ARCHS; do
-DCMAKE_C_FLAGS_INIT="$CFGUARD_CFLAGS" \ -DCMAKE_C_FLAGS_INIT="$CFGUARD_CFLAGS" \
-DCMAKE_CXX_FLAGS_INIT="$CFGUARD_CFLAGS" \ -DCMAKE_CXX_FLAGS_INIT="$CFGUARD_CFLAGS" \
$SRC_DIR $SRC_DIR
$BUILDCMD ${CORES+-j$CORES} $BUILDCMD ${CORES:+-j${CORES}}
$BUILDCMD install $BUILDCMD install
mkdir -p "$PREFIX/$arch-w64-mingw32/bin" mkdir -p "$PREFIX/$arch-w64-mingw32/bin"
if [ -n "$SANITIZERS" ]; then if [ -n "$SANITIZERS" ]; then
+1 -1
View File
@@ -114,7 +114,7 @@ for arch in $ARCHS; do
-DCMAKE_CXX_FLAGS_INIT="$CFGUARD_CFLAGS" \ -DCMAKE_CXX_FLAGS_INIT="$CFGUARD_CFLAGS" \
.. ..
$BUILDCMD ${CORES+-j$CORES} $BUILDCMD ${CORES:+-j${CORES}}
$BUILDCMD install $BUILDCMD install
cd .. cd ..
done done
+1 -1
View File
@@ -147,4 +147,4 @@ cmake \
$CMAKEFLAGS \ $CMAKEFLAGS \
.. ..
$BUILDCMD ${CORES+-j$CORES} install/strip $BUILDCMD ${CORES:+-j${CORES}} install/strip
+1 -1
View File
@@ -309,6 +309,6 @@ cmake \
$CMAKEFLAGS \ $CMAKEFLAGS \
.. ..
$BUILDCMD ${CORES+-j$CORES} install/strip $BUILDCMD ${CORES:+-j${CORES}} install/strip
cp ../LICENSE.TXT $PREFIX cp ../LICENSE.TXT $PREFIX
+1 -1
View File
@@ -95,7 +95,7 @@ for arch in $ARCHS; do
-DCMAKE_CXX_FLAGS_INIT="$CFGUARD_CFLAGS" \ -DCMAKE_CXX_FLAGS_INIT="$CFGUARD_CFLAGS" \
$CMAKEFLAGS \ $CMAKEFLAGS \
.. ..
$BUILDCMD ${CORES+-j$CORES} $BUILDCMD ${CORES:+-j${CORES}}
$BUILDCMD install $BUILDCMD install
rm -f $PREFIX/$arch-w64-mingw32/bin/*iomp5md* rm -f $PREFIX/$arch-w64-mingw32/bin/*iomp5md*
rm -f $PREFIX/$arch-w64-mingw32/lib/*iomp5md* rm -f $PREFIX/$arch-w64-mingw32/lib/*iomp5md*