domi/foxgirl-linux
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

interfere less with what mach bootstrap wants to do

Browse source
This commit is contained in:
ohfp 2020-03-29 13:09:14 +02:00
parent 4303197adc
commit 96ffa1c3ab
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
binary_tarball/scripts/1_Install_Dependencies.sh
View file

@ -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

16
binary_tarball/scripts/3_Configure_Source_Code.sh
View file

@ -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