diff options
| author | Muhammad Omair Javaid <omair.javaid@linaro.org> | 2021-08-10 17:06:57 +0500 |
|---|---|---|
| committer | Muhammad Omair Javaid <omair.javaid@linaro.org> | 2021-08-10 17:06:57 +0500 |
| commit | e548c77c1f5d9dce39abb8d17cfceeb729e2a5ac (patch) | |
| tree | e660d3964e5f4119e746de57ac483638ea8d0b01 | |
| parent | 677bbfb8c03040307ecfbd6af7ee71aa2e6da6ed (diff) | |
tcwg-llvm-release.sh: Avoid word splitting in EXTRA_CONFIG_FLAGS
Change-Id: Ie97ac0a3273fe18aa6b6d3b65917a285575d4a47
| -rwxr-xr-x | tcwg-llvm-release.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tcwg-llvm-release.sh b/tcwg-llvm-release.sh index b77ee783..83e71d7d 100755 --- a/tcwg-llvm-release.sh +++ b/tcwg-llvm-release.sh @@ -154,8 +154,10 @@ OPENMP="" MLIR="" FLANG="" TARGET="$PLATFORM-linux-gnu" +LINK_JOBS="" -EXTRA_CONFIG_FLAGS="-configure-flags -DLLVM_LIT_ARGS='-svj 4'" +LIT_TEST_JOBS=4 +LIT_ARGS="-DLLVM_LIT_ARGS=\"-svj $LIT_TEST_JOBS\"" if echo "$PLATFORM" | grep -qi "armv7"; then TARGET="armv7a-linux-gnueabihf" @@ -163,7 +165,7 @@ if echo "$PLATFORM" | grep -qi "armv7"; then MLIR="-no-mlir" FLANG="-no-flang" if [ x"$USENINJA" != x"" ]; then - EXTRA_CONFIG_FLAGS="$EXTRA_CONFIG_FLAGS -DLLVM_PARALLEL_LINK_JOBS=$LINKJOBS" + LINK_JOBS="-DLLVM_PARALLEL_LINK_JOBS=$LINKJOBS" fi elif ! echo "$PLATFORM" | grep -qi "aarch64" && \ ! echo "$PLATFORM" | grep -qi "x86_64"; then @@ -171,6 +173,8 @@ elif ! echo "$PLATFORM" | grep -qi "aarch64" && \ exit 1 fi +EXTRA_CONFIG_FLAGS=(-configure-flags "$LIT_ARGS" "$LINK_JOBS") + # Dump echo "RELEASE = $RELEASE" echo "CANDIDATE = $CANDIDATE" @@ -204,7 +208,7 @@ SCRIPT_URL=https://raw.githubusercontent.com/llvm/llvm-project/$RELEASE_TAG/llvm # - we want to push the binary public on success or failre result=0 ( - cd "$WORKSPACE" && LC_ALL=C ./$RELEASE_SCRIPT $RELCALL $RCCALL -triple $TARGET -j$BUILDJOBS $OPENMP $MLIR $FLANG $USENINJA $EXTRA_CONFIG_FLAGS |& tee "$LOGBASE-release.$LOGEXT" + cd "$WORKSPACE" && LC_ALL=C ./$RELEASE_SCRIPT $RELCALL $RCCALL -triple $TARGET -j$BUILDJOBS $OPENMP $MLIR $FLANG $USENINJA "${EXTRA_CONFIG_FLAGS[@]}" |& tee "$LOGBASE-release.$LOGEXT" ) & wait $! || result=$? |