diff options
| -rwxr-xr-x | tcwg-llvm-common.sh | 8 | ||||
| -rwxr-xr-x | tcwg-llvm-release.sh | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tcwg-llvm-common.sh b/tcwg-llvm-common.sh index 23baf821..6ec362e1 100755 --- a/tcwg-llvm-common.sh +++ b/tcwg-llvm-common.sh @@ -93,8 +93,8 @@ PUSHUSER=tcwg-buildslave push_binary_name() { local TAG="$1" # ex: ci12, 4.0.0-rc1, r300293 - local TRIPLE="$2" # ex: aarch64-linux-gnu - echo "$PUSHPREFIX-$TAG-$TRIPLE" + local TARGET="$2" # ex: aarch64-linux-gnu + echo "$PUSHPREFIX-$TAG-$TARGET" } push_binary_dir() { @@ -111,10 +111,10 @@ push_scp_url() { push_wget_url() { local TAG="$1" # ex: ci12, 4.0.0-rc1, r300293 - local TRIPLE="$2" # ex: aarch64-linux-gnu + local TARGET="$2" # ex: aarch64-linux-gnu local TYPE="$3" # ex: releases/binaries local BINARY - BINARY="$(push_binary_name "$TAG" "$TRIPLE")" + BINARY="$(push_binary_name "$TAG" "$TARGET")" local PUSHDIR PUSHDIR="$(push_binary_dir "$TYPE")" echo "http://$PUSHSERVER/~$PUSHUSER/$PUSHDIR/$BINARY.$PUSHSUFFIX" diff --git a/tcwg-llvm-release.sh b/tcwg-llvm-release.sh index dbc5a89e..da627290 100755 --- a/tcwg-llvm-release.sh +++ b/tcwg-llvm-release.sh @@ -121,9 +121,9 @@ fi # Additional Options PLATFORM=$(uname -m) -TRIPLE="$PLATFORM-linux-gnu" +TARGET="$PLATFORM-linux-gnu" if echo "$PLATFORM" | grep -qi "armv7"; then - TRIPLE="armv7a-linux-gnueabihf" + TARGET="armv7a-linux-gnueabihf" elif ! echo "$PLATFORM" | grep -qi "aarch64" && \ ! echo "$PLATFORM" | grep -qi "x86_64"; then echo "ERROR: Don't recognise PLATFORM $PLATFORM" @@ -140,7 +140,7 @@ echo "BUILDJOBS = $BUILDJOBS" echo "TOOLCHAIN = $TOOLCHAIN" echo "CC = $CC" echo "CXX = $CXX" -echo "TRIPLE=$TRIPLE" +echo "TARGET=$TARGET" # Logs LOGBASE="$WORKSPACE/tcwg-llvm" @@ -158,13 +158,13 @@ cd "$WORKSPACE" && chmod +x $RELEASE_SCRIPT # - we want to push the binary public on success or failre result=0 ( - cd "$WORKSPACE" && ./$RELEASE_SCRIPT -release $RELEASE $RCCALL -triple $TRIPLE -j$BUILDJOBS + cd "$WORKSPACE" && ./$RELEASE_SCRIPT -release $RELEASE $RCCALL -triple $TARGET -j$BUILDJOBS ) & wait $! || result=$? # Ship PKGTAG="$RELEASE$RCTAG" -PKGNAME="$(push_binary_name "$PKGTAG" "$TRIPLE")" +PKGNAME="$(push_binary_name "$PKGTAG" "$TARGET")" PUSHTYPE="releases" PUSHDIR="$(push_binary_dir "$PUSHTYPE")" |