From a2ddfb0ee91c575bb0d9c1d42944a78e75f9669f Mon Sep 17 00:00:00 2001
From: KemoNine <mcrosson@users.noreply.github.com>
Date: Fri, 18 Jan 2019 19:57:20 +0000
Subject: [PATCH] Fix Plume arm builds (#427)

llvm latest svn commit is broken as of 2019/01/12. This patch pins the llvm+lld versions used for arm compiles.

It also tweaks the architecture detection to be more reliable in multi-lib/multi-arch situations where the CPU is 64bit but the runtime is 32bit.
---
 script/plume-front.sh | 20 ++++++++++++++++++--
 script/wasm-deps.sh   | 28 ++++++++++++++++++++++++----
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/script/plume-front.sh b/script/plume-front.sh
index 9f447be1..8568e076 100644
--- a/script/plume-front.sh
+++ b/script/plume-front.sh
@@ -1,8 +1,24 @@
 #!/bin/bash
 
-ARCH=`arch`
+ARCH=$(python <<EOF
+from __future__ import print_function
+import platform
+processor = platform.machine()
+architecture = platform.architecture()
+if processor == 'aarch64':
+    # Mutli arch arm support is why this 32bit check is present
+    if '32bit' in architecture:
+        print('armv71', end='')
+    else:
+        print('aarch64', end='')
+elif processor == 'x86 64' or processor == 'x86_64':
+    print('amd64', end='')
+elif processor == 'armv7l':
+    print('armhf', end='')
+EOF
+)
 
-if [ "$ARCH" == "aarch64" -o "$ARCH" == "armv7l" ] ; then
+if [ $ARCH == "aarch64" -o $ARCH == "armv71" ] ; then
     export PATH=/opt/local/llvm/bin:${PATH}
     cd /app
     RUSTFLAGS="-C linker=lld" cargo web deploy -p plume-front
diff --git a/script/wasm-deps.sh b/script/wasm-deps.sh
index 02a899be..82b60e65 100644
--- a/script/wasm-deps.sh
+++ b/script/wasm-deps.sh
@@ -1,14 +1,34 @@
 #!/bin/bash
 
-ARCH=`arch`
+ARCH=$(python <<EOF
+from __future__ import print_function
+import platform
+processor = platform.machine()
+architecture = platform.architecture()
+if processor == 'aarch64':
+    # Mutli arch arm support is why this 32bit check is present
+    if '32bit' in architecture:
+        print('armv71', end='')
+    else:
+        print('aarch64', end='')
+elif processor == 'x86 64' or processor == 'x86_64':
+    print('amd64', end='')
+elif processor == 'armv7l':
+    print('armhf', end='')
+EOF
+)
 
-if [ "$ARCH" == "aarch64" -o "$ARCH" == "armv7l" ] ; then
+echo "Detected arch: $ARCH"
+
+if [ $ARCH == "aarch64" -o $ARCH == "armv71" ] ; then
     apt-get install -y --no-install-recommends build-essential subversion ninja-build cmake
     mkdir -p /scratch/src
     cd /scratch/src
-    svn co http://llvm.org/svn/llvm-project/llvm/trunk llvm
+    # Pin LLVM to post 7.0.1 tag and pin to a known-good revision for Plume builds
+    svn co -r350977 http://llvm.org/svn/llvm-project/llvm/trunk/ llvm
     cd /scratch/src/llvm/tools
-    svn co http://llvm.org/svn/llvm-project/lld/trunk lld
+    # Pin lld to post 7.0.1 tag and pin to a known-good revision for Plume builds
+    svn co -r350975 http://llvm.org/svn/llvm-project/lld/trunk lld
     #svn co http://llvm.org/svn/llvm-project/cfe/trunk clang
     #svn co http://llvm.org/svn/llvm-project/clang-tools-extra/trunk extra
     mkdir -p /scratch/build/arm