diff options
| author | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-03-29 11:23:57 +0200 |
|---|---|---|
| committer | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-03-29 11:23:57 +0200 |
| commit | 5e48f983f18686f08159a616f40c522772924a00 (patch) | |
| tree | 56b57164139a3619aa62593f81aa41cabdaa403d /binary_tarball/scripts/4_Build_Binary_Tarball.sh | |
| parent | various (hopefully) script fixes (diff) | |
| download | librewolf-linux-5e48f983f18686f08159a616f40c522772924a00.tar.gz librewolf-linux-5e48f983f18686f08159a616f40c522772924a00.tar.bz2 librewolf-linux-5e48f983f18686f08159a616f40c522772924a00.zip | |
specify clang versions; some further script fixes/corrections
Diffstat (limited to 'binary_tarball/scripts/4_Build_Binary_Tarball.sh')
| -rwxr-xr-x | binary_tarball/scripts/4_Build_Binary_Tarball.sh | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/binary_tarball/scripts/4_Build_Binary_Tarball.sh b/binary_tarball/scripts/4_Build_Binary_Tarball.sh index 16f77b6..e38c808 100755 --- a/binary_tarball/scripts/4_Build_Binary_Tarball.sh +++ b/binary_tarball/scripts/4_Build_Binary_Tarball.sh @@ -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 |