projects/clang/build

@@ -4,9 +4,15 @@ distdir=/var/tmp/dist/[% project %]
 mkdir -p /var/tmp/dist
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %]
 export PATH="/var/tmp/dist/cmake/bin:$PATH"
-[% IF c("var/linux") %]
+  [% IF c("var/linux") %]
   [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'),
                               hardened_gcc => 0 }) %]
+  [% IF c("var/linux-cross") -%]
+    [% pc('gcc', 'var/setup', {
+      compiler_tarfile => c('input_files_by_name/' _ 'gcc-host'),
+      target => [ c('var/channel'), 'basebrowser-linux-x86_64' ]
+      }) %]
+    [% END -%]
   [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %]
 [% END -%]
 [% IF c("var/android") %]

projects/clang/config

@@ -12,6 +12,12 @@ input_files:
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
     enable: '[% c("var/linux") || c("var/android") %]'
+  - name: gcc-host
+    project: gcc
+    enable: '[% c("var/linux-cross") %]'
+    target:
+      - '[% c("var/channel") %]'
+      - 'basebrowser-linux-x86_64'
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") || c("var/android") %]'

projects/cmake/build

@@ -4,7 +4,7 @@ distdir=/var/tmp/dist/[% project %]
 [% IF c("var/linux") %]
   [% pc('gcc', 'var/setup', {
     compiler_tarfile => c('input_files_by_name/gcc'),
-    target => [ c('var/channel'), 'torbrowser-linux-x86_64' ],
+    target => [ c('var/channel'), 'basebrowser-linux-x86_64' ],
     hardened_gcc => 0
   }) %]
 [% END -%]

projects/gcc/config

@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-filename: '[% project %]-[% c("version") %]-[% IF c("linux-cross") %][% c("var/osname") %][% ELSE %]x86[% END %]-[% c("var/build_id") %].tar.gz'
+filename: '[% project %]-[% c("version") %]-[% IF c("var/linux-cross") %][% c("var/osname") %][% ELSE %]x86[% END %]-[% c("var/build_id") %].tar.gz'
 # Note: When updating the gcc version, if this includes a libstdc++
 # ABI change we should also update projects/firefox/abicheck.cc to
 # require the new version.

projects/rust/build

@@ -14,7 +14,7 @@ export PATH="$distdir-rust-prebuilt/bin:$PATH"
 [% IF c("var/linux-cross") -%]
   [% pc('gcc', 'var/setup', {
     compiler_tarfile => c('input_files_by_name/' _ 'gcc-host'),
-    target => [ c('var/channel'), 'torbrowser-linux-x86_64' ]
+    target => [ c('var/channel'), 'basebrowser-linux-x86_64' ]
   }) %]
 [% END -%]
 [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]

projects/tor/build

@@ -6,7 +6,7 @@
   [% pc('gcc', 'var/setup', {
     compiler_tarfile => c('input_files_by_name/' _ 'gcc-host'),
     hardened_gcc => 0,
-    target => [ c('var/channel'), 'torbrowser-linux-x86_64' ]
+    target => [ c('var/channel'), 'basebrowser-linux-x86_64' ]
   }) %]
 
   # GCC's cc1 expects Jessie libmpfr; we feed it a symlink to Buster's instead