[tor-commits] [Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41142: Add no_crosscompile to linux-cross host tools and clang

[boklm (@boklm)]

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build


Commits:
cb3ba59c by NoisyCoil at 2024-10-17T13:37:29+02:00
Bug 41142: Add no_crosscompile to linux-cross host tools and clang

- - - - -
c10878fd by NoisyCoil at 2024-10-17T13:37:29+02:00
Bug 41142: Add the linux-aarch64 target to Rust

- - - - -


7 changed files:

- projects/clang/config
- projects/cmake/config
- projects/ninja/config
- projects/node/config
- projects/python/config
- projects/rust/config
- projects/wasi-sysroot/config


Changes:

=====================================
projects/clang/config
=====================================
@@ -6,15 +6,20 @@ container:
 
 var:
   llvm_version: '[% pc("llvm-project", "version") %]'
+  no_crosscompile: 1
 
 input_files:
   - project: container-image
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
     enable: '[% c("var/linux") %]'
+    # Override the target to make sure we don't have linux-cross
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") %]'
+    target:
+      - '[% c("var/channel") %]'
+      - '[% c("var/projectname") %]-linux-x86_64'
   - project: cmake
     name: cmake
   - project: llvm-project


=====================================
projects/cmake/config
=====================================
@@ -7,6 +7,8 @@ gpg_keyring: cmake.gpg
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
 container:
   use_container: 1
+var:
+  no_crosscompile: 1
 
 input_files:
   - project: container-image


=====================================
projects/ninja/config
=====================================
@@ -5,6 +5,8 @@ git_hash: a524bf3f6bacd1b4ad85d719eed2737d8562f27a #v1.11.1
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
 container:
   use_container: 1
+var:
+  no_crosscompile: 1
 
 input_files:
   - project: container-image


=====================================
projects/node/config
=====================================
@@ -6,15 +6,20 @@ container:
 var:
   node_version: 18.19.0
   node_sha256: f52b41af20596a9abd8ed75241837ec43945468221448bbf841361e2091819b6
+  no_crosscompile: 1
 
 input_files:
   - URL: 'https://nodejs.org/dist/v[% c("var/node_version") %]/node-v[% c("var/node_version") %].tar.xz'
     sha256sum: '[% c("var/node_sha256") %]'
     name: node
   - project: container-image
+    # Override the target to make sure we don't have linux-cross
   - project: binutils
     name: binutils
     enable: '[% c("var/linux") %]'
+    target:
+      - '[% c("var/channel") %]'
+      - '[% c("var/projectname") %]-linux-x86_64'
   - project: '[% c("var/compiler") %]'
     name: '[% c("var/compiler") %]'
     enable: '[% c("var/linux") %]'


=====================================
projects/python/config
=====================================
@@ -4,6 +4,7 @@ filename: 'python-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
 container:
   use_container: 1
 var:
+  no_crosscompile: 1
   deps:
     - build-essential
     - python-all


=====================================
projects/rust/config
=====================================
@@ -19,6 +19,11 @@ targets:
       target: i686-unknown-linux-gnu
       target_flags: --set target.i686-unknown-linux-gnu.linker=clang --set target.i686-unknown-linux-gnu.ar=llvm-ar --set target.i686-unknown-linux-gnu.ranlib=llvm-ranlib
 
+  linux-aarch64:
+    var:
+      target: aarch64-unknown-linux-gnu
+      target_flags: --set target.aarch64-unknown-linux-gnu.linker=aarch64-linux-gnu-gcc --set target.aarch64-unknown-linux-gnu.ar=llvm-ar --set target.aarch64-unknown-linux-gnu.ranlib=llvm-ranlib
+
   macos:
     var:
       target: '[% c("var/build_target") %]'


=====================================
projects/wasi-sysroot/config
=====================================
@@ -12,6 +12,9 @@ git_submodule: 0
 container:
   use_container: 1
 
+var:
+  no_crosscompile: 1
+
 input_files:
   - project: container-image
   # We do not use GCC, but we need its libsdc++ to run Clang



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/b152b726b91d57e5dcbca6ca1ab872ab7c3cf7d7...c10878fd5ebf02d56d9ed468832c1577ca4ab8a1

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/b152b726b91d57e5dcbca6ca1ab872ab7c3cf7d7...c10878fd5ebf02d56d9ed468832c1577ca4ab8a1
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/20241017/c6e04754/attachment-0001.htm>