Unverified Commit f6b89500 authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Merge remote-tracking branch 'gkgl/bug_40002_v2'

parents d1ae1116 968e5366
......@@ -23,8 +23,8 @@ release-android-aarch64: submodule-update
release-linux-x86_64: submodule-update
$(rbm) build release --target release --target torbrowser-linux-x86_64
release-linux-x86_64-debug: submodule-update
$(rbm) build release --target release --target torbrowser-linux-x86_64-debug
release-linux-x86_64-asan: submodule-update
$(rbm) build release --target release --target torbrowser-linux-x86_64-asan
release-linux-i686: submodule-update
$(rbm) build release --target release --target torbrowser-linux-i686
......@@ -62,8 +62,8 @@ alpha-android-aarch64: submodule-update
alpha-linux-x86_64: submodule-update
$(rbm) build release --target alpha --target torbrowser-linux-x86_64
alpha-linux-x86_64-debug: submodule-update
$(rbm) build release --target alpha --target torbrowser-linux-x86_64-debug
alpha-linux-x86_64-asan: submodule-update
$(rbm) build release --target alpha --target torbrowser-linux-x86_64-asan
alpha-linux-i686: submodule-update
$(rbm) build release --target alpha --target torbrowser-linux-i686
......@@ -101,8 +101,8 @@ nightly-android-aarch64: submodule-update
nightly-linux-x86_64: submodule-update
$(rbm) build release --target nightly --target torbrowser-linux-x86_64
nightly-linux-x86_64-debug: submodule-update
$(rbm) build release --target nightly --target torbrowser-linux-x86_64-debug
nightly-linux-x86_64-asan: submodule-update
$(rbm) build release --target nightly --target torbrowser-linux-x86_64-asan
nightly-linux-i686: submodule-update
$(rbm) build release --target nightly --target torbrowser-linux-i686
......@@ -140,8 +140,8 @@ testbuild-android-aarch64: submodule-update
testbuild-linux-x86_64: submodule-update
$(rbm) build release --target testbuild --target torbrowser-linux-x86_64
testbuild-linux-x86_64-debug: submodule-update
$(rbm) build release --target testbuild --target torbrowser-linux-x86_64-debug
testbuild-linux-x86_64-asan: submodule-update
$(rbm) build release --target testbuild --target torbrowser-linux-x86_64-asan
testbuild-linux-i686: submodule-update
$(rbm) build release --target testbuild --target torbrowser-linux-i686
......
......@@ -44,9 +44,9 @@ By default it is based on the alpha channel, but you can change that by
editing rbm.local.conf. The resulting build can be found in directory
testbuild.
{release,alpha,nightly,testbuild}-linux-x86_64-debug
{release,alpha,nightly,testbuild}-linux-x86_64-asan
----------------------------------------------------
Create a debug build for Linux x86_64 with debug features such as ASan.
Create a build for Linux x86_64 with Address Sanitizer enabled.
{release,alpha,nightly,testbuild}-src
-------------------------------------
......
......@@ -62,7 +62,6 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
cd /var/tmp/build/[% project %]-[% c("version") %]
mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig
[% IF c("var/asan") -%]
mv -f .mozconfig-asan .mozconfig
# Without disabling LSan our build is blowing up:
# https://bugs.torproject.org/10599#comment:52
export ASAN_OPTIONS="detect_leaks=0"
......
......@@ -117,7 +117,7 @@ input_files:
- name: '[% c("var/compiler") %]'
project: '[% c("var/compiler") %]'
- filename: get-moz-build-date
- filename: 'mozconfig-[% c("var/osname") %]'
- filename: 'mozconfig-[% c("var/osname") %][% IF c("var/asan") %]-asan[% END %]'
name: mozconfig
- project: binutils
name: binutils
......
. $topsrcdir/browser/config/mozconfig
export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc"
export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc"
# We need to add -ldl explicitely due to bug 1213698
export LDFLAGS="-fsanitize=address -ldl"
# Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff
# (which is part of mar-tools and is not distributed to end-users) with
# ASan. See bug 17858.
export HOST_CFLAGS=""
export HOST_CXXFLAGS=""
export HOST_LDFLAGS="-ldl"
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@
mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
export MOZILLA_OFFICIAL=1
export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc'
ac_add_options --enable-address-sanitizer
ac_add_options --disable-jemalloc
ac_add_options --disable-elf-hack
ac_add_options --with-clang-path=/var/tmp/dist/clang/bin/clang
ac_add_options --enable-optimize
ac_add_options --enable-official-branding
# Let's support GTK3 for ESR60
ac_add_options --enable-default-toolkit=cairo-gtk3
ac_add_options --enable-tor-browser-update
ac_add_options --enable-verify-mar
ac_add_options --disable-strip
ac_add_options --disable-install-strip
ac_add_options --disable-tests
ac_add_options --disable-debug
ac_add_options --disable-crashreporter
ac_add_options --disable-webrtc
ac_add_options --disable-parental-controls
ac_add_options --disable-eme
ac_add_options --enable-proxy-bypass-protection
# Disable telemetry
ac_add_options MOZ_TELEMETRY_REPORTING=
......@@ -47,10 +47,10 @@ targets:
torbrowser-linux-x86_64:
var:
torbrowser-linux-x86_64: 1
torbrowser-linux-x86_64-debug:
torbrowser-linux-x86_64-asan:
var:
torbrowser-linux-x86_64: 1
debug-build: '-debug'
asan-build: '-asan'
torbrowser-linux-i686:
var:
torbrowser-linux-i686: 1
......@@ -154,7 +154,7 @@ input_files:
enable: '[% c("var/torbrowser-linux-x86_64") %]'
target:
- '[% c("var/build_target") %]'
- 'torbrowser-linux-x86_64[% c("var/debug-build") %]'
- 'torbrowser-linux-x86_64[% c("var/asan-build") %]'
- name: linux-i686
project: tor-browser
......
......@@ -335,8 +335,8 @@ targets:
torbrowser-linux-x86_64:
- linux-x86_64
- linux
torbrowser-linux-x86_64-debug:
- linux-debug
torbrowser-linux-x86_64-asan:
- linux-asan
- linux-x86_64
- linux
torbrowser-linux-i686:
......@@ -380,9 +380,13 @@ targets:
- libtool
- zip
- unzip
linux-debug:
linux-asan:
var:
asan: 1
# RLBox needs clang to create .wasm files but we use mostly GCC for our
# ASan builds. Thus, the compilation currently breaks with RLBox enabled.
# See: tor-browser-build#40063.
rlbox: 0
torbrowser-windows-i686:
- windows-i686
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment