Verified Commit 13687c13 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

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.
parent 2d28eb56

projects/geckoview/build

+1 −2
Original line number Diff line number Diff line
@@ -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

+0 −2
Original line number Diff line number Diff line
@@ -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

+0 −3
Original line number Diff line number Diff line
@@ -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

+0 −2
Original line number Diff line number Diff line
@@ -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

+0 −2
Original line number Diff line number Diff line
@@ -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