[libcxx-commits] [libcxx] eceae25 - [libc++] CI: Always build for both i386 and x86_64 in the back-deployment script

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-04-08T16:11:20-04:00
New Revision: eceae25f6d9a29303573859841481c24033f58e6

URL: https://github.com/llvm/llvm-project/commit/eceae25f6d9a29303573859841481c24033f58e6
DIFF: https://github.com/llvm/llvm-project/commit/eceae25f6d9a29303573859841481c24033f58e6.diff

LOG: [libc++] CI: Always build for both i386 and x86_64 in the back-deployment script

Added: 
    

Modified: 
    libcxx/utils/ci/macos-backdeployment.sh

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/macos-backdeployment.sh b/libcxx/utils/ci/macos-backdeployment.sh
index 3cb4cc1c9531..ed83e334ecfb 100755
--- a/libcxx/utils/ci/macos-backdeployment.sh
+++ b/libcxx/utils/ci/macos-backdeployment.sh
@@ -107,9 +107,11 @@ PREVIOUS_DYLIBS_URL="http://lab.llvm.org:8080/roots/libcxx-roots.tar.gz"
 LLVM_TARBALL_URL="https://github.com/llvm-mirror/llvm/archive/master.tar.gz"
 
 
-echo "@@@ Configuring architecture-related stuff @@@"
-if [[ "${ARCH}" == "64" ]]; then CMAKE_ARCH_STRING="x86_64"; else CMAKE_ARCH_STRING="i386"; fi
-if [[ "${ARCH}" == "64" ]]; then LIT_ARCH_STRING="";         else LIT_ARCH_STRING="--param=enable_32bit=true"; fi
+echo "@@@ Setting up LIT flags for architecture @@@"
+LIT_ARCH_STRING=""
+if [[ "${ARCH}" == "32" ]]; then
+  LIT_ARCH_STRING="--param=enable_32bit=true"
+fi
 echo "@@@@@@"
 
 
@@ -121,7 +123,7 @@ mkdir -p "${LLVM_BUILD_DIR}"
     -GNinja \
     -DCMAKE_INSTALL_PREFIX="${LLVM_INSTALL_DIR}" \
     -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \
-    -DCMAKE_OSX_ARCHITECTURES="${CMAKE_ARCH_STRING}" \
+    -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \
     "${MONOREPO_ROOT}/llvm"
 )
 echo "@@@@@@"