[tbb-commits] [tor-browser-build/master] Bug 31448: Disable firefox debug-symbols for linux-i686

[gk at torproject.org]

commit 8cc9eaf22abf0c9d98b88bb60aaa1476e4a6555c
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Sep 12 11:06:39 2019 +0200

    Bug 31448: Disable firefox debug-symbols for linux-i686
    
    This allows us to switch back to ld.gold as the linker, and fix #31618.
    
    ld.gold fails when we build with debug symbols for linux-i686:
    
      30:31.20 toolkit/library/symverscript.stub
      30:31.26 toolkit/library/libxul.so
      30:39.58 /var/tmp/dist/binutils/bin/ld.gold.real: internal error in relocate_section, at i386.cc:3684
---
 projects/firefox/build                | 4 ++--
 projects/firefox/mozconfig-linux-i686 | 8 +++-----
 projects/tor-browser/build            | 4 +++-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index 13e70f5..ac63c84 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -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',
diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686
index c8f19a4..0a05864 100755
--- a/projects/firefox/mozconfig-linux-i686
+++ b/projects/firefox/mozconfig-linux-i686
@@ -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
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index aeb77de..ed69f19 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -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 -%]