From 96ffa1c3ab28233df204607f16ec3f221af58ed3 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Sun, 29 Mar 2020 13:09:14 +0200
Subject: [PATCH] interfere less with what mach bootstrap wants to do

---
 binary_tarball/scripts/1_Install_Dependencies.sh | 11 +++++------
 .../scripts/3_Configure_Source_Code.sh           | 16 +++++++---------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/binary_tarball/scripts/1_Install_Dependencies.sh b/binary_tarball/scripts/1_Install_Dependencies.sh
index 9395dda..f68edc9 100755
--- a/binary_tarball/scripts/1_Install_Dependencies.sh
+++ b/binary_tarball/scripts/1_Install_Dependencies.sh
@@ -13,9 +13,8 @@ DEBIAN_FRONTEND=noninteractive apt-get -qq update;
 DEBIAN_FRONTEND=noninteractive apt-get -y -qq install $_DEPENDENCIES;
 
 # Installs (non-ancient) clang
-
-DEBIAN_FRONTEND=noninteractive 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"
-DEBIAN_FRONTEND=noninteractive wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add
-DEBIAN_FRONTEND=noninteractive apt-get update
-DEBIAN_FRONTEND=noninteractive apt-get -y install clang-9
+# DEBIAN_FRONTEND=noninteractive 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"
+# DEBIAN_FRONTEND=noninteractive wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add
+# DEBIAN_FRONTEND=noninteractive apt-get update
+# DEBIAN_FRONTEND=noninteractive apt-get -y install clang-9
diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh
index 01abe07..37f5bd8 100755
--- a/binary_tarball/scripts/3_Configure_Source_Code.sh
+++ b/binary_tarball/scripts/3_Configure_Source_Code.sh
@@ -20,10 +20,6 @@ cd $srcdir
 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/${CARCH}-linux-gnu/"
-ac_add_options --with-clang-path="/usr/bin/clang-9"
-
 # This supposedly speeds up compilation (We test through dogfooding anyway)
 ac_add_options --disable-tests
 ac_add_options --disable-debug
@@ -33,11 +29,13 @@ ac_add_options --disable-debug
 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
+
+# let mach bootstrap do its thing instead
+# 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