From db26c014519431c27c9e23e445b6fe19dca338f8 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Tue, 31 Mar 2020 09:53:45 +0200
Subject: use clang from repos for aarch64

---
 binary_tarball/scripts/1_Install_Dependencies.sh  | 21 ++++++++++-----------
 binary_tarball/scripts/3_Configure_Source_Code.sh | 21 +++++++++++++--------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/binary_tarball/scripts/1_Install_Dependencies.sh b/binary_tarball/scripts/1_Install_Dependencies.sh
index 833b139..7f2c85a 100755
--- a/binary_tarball/scripts/1_Install_Dependencies.sh
+++ b/binary_tarball/scripts/1_Install_Dependencies.sh
@@ -49,14 +49,13 @@ printf "\nInstalling dependencies: $_DEPENDENCIES\n";
 apt-get -qq update;
 apt-get -y -qq install $_DEPENDENCIES;
 
-# Installs (non-ancient) clang
-apt install -y software-properties-common apt-transport-https ca-certificates
-apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main"
-wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add
-apt-get update
-apt-get -y install clang-9 libclang-9-dev
-
-# Installs (non-ancient) nodejs
-# => use nodejs-mozilla instead
-# curl -sL https://deb.nodesource.com/setup_13.x | bash -
-# apt-get install -y nodejs
+if [[ $CARCH == 'x86_64' ]];then
+    # Installs (non-ancient) clang
+    apt install -y software-properties-common apt-transport-https ca-certificates
+    apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main"
+    wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add
+    apt-get update
+    apt-get -y install clang-9 libclang-9-dev
+else
+    apt-get -y install clang-8 libclang-8-dev
+fi
diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh
index df98c85..d75ee74 100755
--- a/binary_tarball/scripts/3_Configure_Source_Code.sh
+++ b/binary_tarball/scripts/3_Configure_Source_Code.sh
@@ -21,8 +21,6 @@ cat >${CI_PROJECT_DIR}/mozconfig <<END
 ac_add_options --enable-application=browser
 
 # to build on ubuntu and pick up clang
-#ac_add_options --with-libclang-path="/usr/lib/llvm-9/lib"
-#ac_add_options --with-clang-path="/usr/bin/clang-9"
 ac_add_options NODEJS=/usr/lib/nodejs-mozilla/bin/node
 ac_add_options NASM=/usr/lib/nasm-mozilla/bin/nasm
 
@@ -40,12 +38,6 @@ ac_add_options --enable-release
 ac_add_options --enable-hardening
 ac_add_options --enable-rust-simd
 
-export CC='clang-9'
-export CXX='clang++-9'
-export AR=llvm-ar-9
-export NM=llvm-nm-9
-export RANLIB=llvm-ranlib-9
-
 # Branding
 ac_add_options --enable-update-channel=release
 ac_add_options --with-app-name=librewolf
@@ -93,6 +85,12 @@ export RUSTFLAGS="-Cdebuginfo=0"
 # should only fail on armv7x
 # ac_add_options --disable-webrtc
 
+export CC='clang-8'
+export CXX='clang++-8'
+export AR=llvm-ar-8
+export NM=llvm-nm-8
+export RANLIB=llvm-ranlib-8
+
 END
 
   LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
@@ -107,6 +105,13 @@ else
     cat >>${CI_PROJECT_DIR}/mozconfig <<END
 # ubuntu seems to recommend this
 ac_add_options --disable-elf-hack
+
+export CC='clang-9'
+export CXX='clang++-9'
+export AR=llvm-ar-9
+export NM=llvm-nm-9
+export RANLIB=llvm-ranlib-9
+
 END
 
 fi
-- 
cgit