GitLab

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,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') %]

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

@@ -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') %]

@@ -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

@@ -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

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

Commits:

8 changed files:

Changes:

@@ -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') %]