[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 41236: Remove binutils when not needed.

[Pier Angelo Vendrame (@pierov)]

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build


Commits:
13687c13 by Pier Angelo Vendrame at 2024-09-25T15:13:44+02:00
Bug 41236: Remove binutils when not needed.

Some of our projects have binutils as a dependency, even though it
seems they do not need it, or they need it only when building for
Linux.
And this prevents us from having a single Rust toolchain that handles
Windows i686 and x86_64, for example, even though Rust itself can
target both.

- - - - -


8 changed files:

- projects/geckoview/build
- projects/geckoview/config
- projects/llvm-runtimes/build
- projects/llvm-runtimes/config
- projects/nasm/build
- projects/nasm/config
- projects/rust/build
- projects/rust/config


Changes:

=====================================
projects/geckoview/build
=====================================
@@ -8,8 +8,7 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %]
 export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config"
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/llvm-runtimes') %]
 cp -r /var/tmp/dist/llvm-runtimes/* /var/tmp/dist/clang/
-tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %]
-export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/binutils/bin:$PATH"
+export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/clang/bin:$PATH"
 
 [% IF c("var/rlbox") -%]
   tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %]


=====================================
projects/geckoview/config
=====================================
@@ -129,8 +129,6 @@ input_files:
     project: '[% c("var/compiler") %]'
   - project: gradle
     name: gradle
-  - project: binutils
-    name: binutils
   - project: rust
     name: rust
   - project: cbindgen


=====================================
projects/llvm-runtimes/build
=====================================
@@ -9,9 +9,6 @@ export PATH="/var/tmp/dist/clang/bin:/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin
 
 [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
 
-tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %]
-export PATH="/var/tmp/dist/binutils/bin:$PATH"
-
 mkdir -p /var/tmp/build
 cd /var/tmp/build
 tar -xf $rootdir/[% c('input_files_by_name/clang-source') %]


=====================================
projects/llvm-runtimes/config
=====================================
@@ -8,8 +8,6 @@ input_files:
   - project: container-image
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
-  - name: binutils
-    project: binutils
   - project: cmake
     name: cmake
   - project: llvm-project


=====================================
projects/nasm/build
=====================================
@@ -3,8 +3,6 @@
 [% IF c("var/linux") %]
   [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'),
                               hardened_gcc => 0 }) %]
-  tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
-  export PATH="/var/tmp/dist/binutils/bin:$PATH"
 [% END -%]
 distdir=/var/tmp/dist/[% project %]
 tar -xf [% project %]-[% c('version') %].tar.xz


=====================================
projects/nasm/config
=====================================
@@ -6,9 +6,6 @@ container:
 
 input_files:
   - project: container-image
-  - project: binutils
-    name: binutils
-    enable: '[% c("var/linux") %]'
   - project: '[% c("var/compiler") %]'
     name: '[% c("var/compiler") %]'
     enable: '[% c("var/linux") %]'


=====================================
projects/rust/build
=====================================
@@ -4,8 +4,6 @@ distdir=/var/tmp/dist/[% project %]
 mkdir -p $distdir
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %]
 export PATH="/var/tmp/dist/cmake/bin:$PATH"
-tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %]
-export PATH=/var/tmp/dist/binutils/bin:$PATH
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %]
 export PATH=/var/tmp/dist/ninja:$PATH
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust_prebuilt') %]


=====================================
projects/rust/config
=====================================
@@ -38,8 +38,6 @@ targets:
 
 input_files:
   - project: container-image
-  - name: binutils
-    project: binutils
   - project: cmake
     name: cmake
   - project: '[% c("var/compiler") %]'



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/13687c1330a9979a842100f187cce17d72341580

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/13687c1330a9979a842100f187cce17d72341580
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20240925/2d00f1d0/attachment-0001.htm>