tools/bazel:toolchain move to trunk

.github/workflows/release.yml

@@ -32,11 +32,11 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install crossbuild-essential-arm64 -y
-          sudo curl -fLo /usr/local/bin/bazel "https://github.com/bazelbuild/bazel/releases/download/6.0.0/bazel-6.0.0-linux-x86_64"
+          sudo curl -fLo /usr/local/bin/bazel "https://github.com/bazelbuild/bazel/releases/download/6.5.0/bazel-6.5.0-linux-x86_64"
           sudo chmod +x /usr/local/bin/bazel
       - name: Build
         run: |
-          bazel build -c opt --cpu=aarch64 --crosstool_top=tools/bazel:toolchain --platforms=tools/bazel:linux-arm64 net/tools:miracle-proxy
+          bazel build -c opt --cpu=aarch64 --crosstool_top=@org_iceboy_trunk//third_party/linux_crosstool net/tools:miracle-proxy
           ln bazel-bin/net/tools/miracle-proxy miracle-proxy-${GITHUB_REF_NAME}-linux-arm64
       - name: Release
         uses: softprops/action-gh-release@v1

WORKSPACE

@@ -47,6 +47,6 @@ boost_deps()
 
 git_repository(
     name = "org_iceboy_trunk",
-    commit = "0be2a93fa780f608f8bfffa48a5e0367a5c08605",
+    commit = "24fc6171c1512293423d9c2fb093ac2bec86f728",
     remote = "https://github.com/iceboy233/trunk.git",
 )

third_party/blake3/BUILD

@@ -8,14 +8,14 @@ cc_library(
         "blake3_impl.h",
         "blake3_portable.c",
     ] + select({
-        ":linux_amd64": [
+        ":linux_x86_64": [
             "blake3_sse2_x86-64_unix.S",
             "blake3_sse41_x86-64_unix.S",
             "blake3_avx2_x86-64_unix.S",
             "blake3_avx512_x86-64_unix.S",
         ],
-        ":linux_arm64": ["blake3_neon.c"],
-        ":windows_amd64": [
+        ":linux_aarch64": ["blake3_neon.c"],
+        ":windows_x86_64": [
             "blake3_sse2_x86-64_windows_msvc.asm",
             "blake3_sse41_x86-64_windows_msvc.asm",
             "blake3_avx2_x86-64_windows_msvc.asm",
@@ -25,27 +25,20 @@ cc_library(
     hdrs = ["blake3.h"],
 )
 
-# TODO: Move this to a shared place.
 config_setting(
-    name = "linux_amd64",
-    constraint_values = [
-        "@platforms//cpu:x86_64",
-        "@platforms//os:linux",
-    ],
+    name = "linux_x86_64",
+    values = {"cpu": "k8"},
+    constraint_values = ["@platforms//os:linux"],
 )
 
 config_setting(
-    name = "linux_arm64",
-    constraint_values = [
-        "@platforms//cpu:arm64",
-        "@platforms//os:linux",
-    ],
+    name = "linux_aarch64",
+    values = {"cpu": "aarch64"},
+    constraint_values = ["@platforms//os:linux"],
 )
 
 config_setting(
-    name = "windows_amd64",
-    constraint_values = [
-        "@platforms//cpu:x86_64",
-        "@platforms//os:windows",
-    ],
+    name = "windows_x86_64",
+    values = {"cpu": "x64_windows_msvc"},
+    constraint_values = ["@platforms//os:windows"],
 )