Commit 3b899b76 authored by Georg Koppen's avatar Georg Koppen
Browse files

Merge remote-tracking branch 'boklm/bug_31448_v5'

parents a7a90d35 8cc9eaf2
......@@ -199,7 +199,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/
cd $distdir
[% IF c("var/linux") %]
[% IF c("var/linux-x86_64") %]
mkdir -p $distdir/Debug/Browser/gtk2
# Strip and generate debuginfo for the firefox binary that we keep, all *.so
# files, the plugin-container, and the updater (see ticket #10126)
......@@ -240,7 +240,7 @@ END;
tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser.tar.gz',
}) %]
[% IF c("var/linux") %]
[% IF c("var/linux-x86_64") %]
[% c('tar', {
tar_src => [ 'Debug' ],
tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser-debug.tar.xz',
......
......@@ -18,9 +18,6 @@ export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc'
ac_add_options --target=i686-linux-gnu
# XXX: gold and lld break when linking libxul, resort to bfd
ac_add_options --enable-linker=bfd
ac_add_options --enable-optimize
#ac_add_options --disable-optimize
ac_add_options --enable-official-branding
......@@ -32,8 +29,6 @@ ac_add_options --enable-tor-browser-update
ac_add_options --enable-signmar
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
......@@ -42,3 +37,6 @@ ac_add_options --disable-webrtc
ac_add_options --disable-eme
ac_add_options --enable-proxy-bypass-protection
#ac_add_options --disable-ctypes
# Bug 31448: ld.gold fails if we don't disable debug-symbols
ac_add_options --disable-debug-symbols
......@@ -274,8 +274,10 @@ rm -rf $distdir/${PKG_DIR}
SCRIPT_EOF
cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/
[% IF c("var/linux") -%]
[% IF c("var/linux-x86_64") -%]
cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.xz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz
[% END -%]
[% IF c("var/linux") -%]
cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz
[% END -%]
......
Supports Markdown
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