[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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

Title: GitLab

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:

Changes:

  • projects/geckoview/build
    ... ... @@ -8,8 +8,7 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %]
    8 8 
     export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config"
    9 9 
     tar -C /var/tmp/dist -xf [% c('input_files_by_name/llvm-runtimes') %]
    10 10 
     cp -r /var/tmp/dist/llvm-runtimes/* /var/tmp/dist/clang/
    11 
    -tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %]
    12 
    -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"
    11 
    +export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/clang/bin:$PATH"
    13 12
    14 13 
     [% IF c("var/rlbox") -%]
    15 14 
       tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %]

  • projects/geckoview/config
    ... ... @@ -129,8 +129,6 @@ input_files:
    129 129 
         project: '[% c("var/compiler") %]'
    130 130 
       - project: gradle
    131 131 
         name: gradle
    132 
    -  - project: binutils
    133 
    -    name: binutils
    134 132 
       - project: rust
    135 133 
         name: rust
    136 134 
       - 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
    9 9
    10 10 
     [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
    11 11
    12 
    -tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %]
    13 
    -export PATH="/var/tmp/dist/binutils/bin:$PATH"
    14 
    -
    15 12 
     mkdir -p /var/tmp/build
    16 13 
     cd /var/tmp/build
    17 14 
     tar -xf $rootdir/[% c('input_files_by_name/clang-source') %]

  • projects/llvm-runtimes/config
    ... ... @@ -8,8 +8,6 @@ input_files:
    8 8 
       - project: container-image
    9 9 
       - name: '[% c("var/compiler") %]'
    10 10 
         project: '[% c("var/compiler") %]'
    11 
    -  - name: binutils
    12 
    -    project: binutils
    13 11 
       - project: cmake
    14 12 
         name: cmake
    15 13 
       - project: llvm-project

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

  • projects/nasm/config
    ... ... @@ -6,9 +6,6 @@ container:
    6 6
    7 7 
     input_files:
    8 8 
       - project: container-image
    9 
    -  - project: binutils
    10 
    -    name: binutils
    11 
    -    enable: '[% c("var/linux") %]'
    12 9 
       - project: '[% c("var/compiler") %]'
    13 10 
         name: '[% c("var/compiler") %]'
    14 11 
         enable: '[% c("var/linux") %]'

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

  • projects/rust/config
    ... ... @@ -38,8 +38,6 @@ targets:
    38 38
    39 39 
     input_files:
    40 40 
       - project: container-image
    41 
    -  - name: binutils
    42 
    -    project: binutils
    43 41 
       - project: cmake
    44 42 
         name: cmake
    45 43 
       - project: '[% c("var/compiler") %]'

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits