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

specify clang versions; some further script fixes/corrections

Browse source
This commit is contained in:
ohfp 2020-03-29 11:23:57 +02:00
parent 8df33c61bb
commit 5e48f983f1
2 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
binary_tarball/scripts/3_Configure_Source_Code.sh
View file

@ -24,15 +24,16 @@ ac_add_options --enable-application=browser
ac_add_options --disable-tests
ac_add_options --disable-debug
ac_add_options --prefix=/usr
# might cause issues for appimage/flatpak, so keep it unset
# ac_add_options --prefix=/usr
ac_add_options --enable-release
ac_add_options --enable-hardening
ac_add_options --enable-rust-simd
export CC='clang'
export CXX='clang++'
export AR=llvm-ar
export NM=llvm-nm
export RANLIB=llvm-ranlib
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

24
binary_tarball/scripts/4_Build_Binary_Tarball.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash
printf "\n\n--------------------------------------- BUILD -----------------------------------------------\n";
set -e
# Setup Script Variables
srcdir=$1;
OUTPUT_TARBALL=$2;
@ -8,12 +10,23 @@ CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../../)}
_SOURCE_CODE_BINARY_TARBALL_LOCATION="./obj*/dist/librewolf*.tar.bz2";
_MOZBUILD=$srcdir/../mozbuild
export CPPFLAGS="-D_FORTIFY_SOURCE=2"
export CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
export CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
# we do change / unset some of them later, but setting them as set by Arch
# might make it easier to maintain changes in build scripts on both sides
if [[ $CARCH == 'aarch64' ]]; then
export CPPFLAGS="-D_FORTIFY_SOURCE=2"
export CFLAGS="-march=armv8-a -O2 -pipe -fstack-protector-strong -fno-plt"
export CXXFLAGS="-march=armv8-a -O2 -pipe -fstack-protector-strong -fno-plt"
export LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
else
export CPPFLAGS="-D_FORTIFY_SOURCE=2"
export CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
export CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
export LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
fi
export MOZ_NOSPAM=1
export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
export MOZBUILD_STATE_PATH="${_MOZBUILD}"
if [[ $CARCH == 'aarch64' ]]; then
LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
@ -37,6 +50,9 @@ cd $srcdir;
printf "\nRunning bootstrapper to install build dependencies (using ./mach script within source code)\n";
./mach bootstrap --application-choice=browser --no-interactive;
# add cargo binary to path
source /root/.cargo/env
rm -f mozconfig
# Do 3-tier PGO