Merge branch 'main' into isaac/mac-fixes

swift-nav · Oct 6, 2023 · 6bfc901 · 6bfc901
2 parents 6007111 + 9924b81
commit 6bfc901
Show file tree

Hide file tree

Showing 3 changed files with 729 additions and 4 deletions.
diff --git a/cc/constraints/BUILD.bazel b/cc/constraints/BUILD.bazel
@@ -99,3 +99,19 @@ selects.config_setting_group(
         ":unspecified_arm",
     ],
 )
+
+selects.config_setting_group(
+    name = "aarch64_debian",
+    match_all = [
+        "@platforms//cpu:aarch64",
+        "glibc_2_31",
+    ],
+)
+
+selects.config_setting_group(
+    name = "x86_64_debian",
+    match_all = [
+        "@platforms//cpu:x86_64",
+        "glibc_2_31",
+    ],
+)
diff --git a/cc/repositories.bzl b/cc/repositories.bzl
@@ -60,30 +60,30 @@ def aarch64_sysroot():
     maybe(
         http_archive,
         name = "aarch64-sysroot",
-        sha256 = "9bd27c7ec6aa4bd3d4df60cd04228669bcf366aec32d4b4dc7b504de2f63121e",
+        sha256 = "b720ec47e4b53db12cd2f5fbf2c162be9a07a3e2f699be6cf2912a570001f39f",
         build_file_content = """
 filegroup(
     name = "aarch64-sysroot",
     srcs = glob(["*/**"]),
     visibility = ["//visibility:public"],
 )
     """,
-        url = "https://github.com/swift-nav/swift-toolchains/releases/download/bullseye-aarch64-sysroot-v1/debian_bullseye_aarch64_sysroot.tar.xz",
+        url = "https://github.com/swift-nav/swift-toolchains/releases/download/bullseye-sysroot-v2/debian_bullseye_aarch64_sysroot.tar.xz",
     )
 
 def x86_64_sysroot():
     maybe(
         http_archive,
         name = "x86_64-sysroot",
-        sha256 = "a19dd3fe4a61d0e1a18f197be1b0c9a2a06b1deabaff2f1479cfcc2cb0df85d1",
+        sha256 = "becd9de3af6e4e8bc1bc116d77dbde6ab28ebd5a77d59adaa5380ee936a1f541",
         build_file_content = """
 filegroup(
     name = "x86_64-sysroot",
     srcs = glob(["*/**"]),
     visibility = ["//visibility:public"],
 )
     """,
-        url = "https://github.com/swift-nav/swift-toolchains/releases/download/bullseye-x86_64-sysroot-v1/debian_bullseye_x86_64_sysroot.tar.xz",
+        url = "https://github.com/swift-nav/swift-toolchains/releases/download/bullseye-sysroot-v2/debian_bullseye_x86_64_sysroot.tar.xz",
     )
 
 def register_swift_cc_toolchains():