Fix initial issues found by bazel 7
Bazel 7 is more strict about a copule of things. We can fix those
without issue in bazel 6, so let's do that to make the big upgrade
step smaller.
Change-Id: If7bf12ad88cb29730f01944d72b120fe0cf88634
Signed-off-by: Austin Schuh <austin.linux@gmail.com>
diff --git a/.bazelrc b/.bazelrc
index 61ac856..1febc54 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -81,7 +81,6 @@
test --test_output=errors --test_timeout=-1,-1,-1,5500
build --sandbox_base=/dev/shm/
-build --experimental_multi_threaded_digest
build --sandbox_fake_hostname=true
build --sandbox_fake_username=true
@@ -93,10 +92,12 @@
# Switch to SHA256 for compatibility with distributed caching.
startup --host_jvm_args=-Dbazel.DigestFunction=SHA256
-build --spawn_strategy=linux-sandbox
+build --spawn_strategy=sandboxed
build --sandbox_default_allow_network=false
-build --strategy=TsProject=linux-sandbox
+build --strategy=TsProject=sandboxed
+build --strategy=CopyFile=standalone
+build --strategy=CopyDirectory=standalone
# Use our hermetic JDK.
# Note that this doesn't quite work fully, but it should. See
diff --git a/frc971/downloader.bzl b/frc971/downloader.bzl
index ec93f5b..9d00113 100644
--- a/frc971/downloader.bzl
+++ b/frc971/downloader.bzl
@@ -7,7 +7,6 @@
binaries = [],
data = [],
dirs = None,
- default_target = None,
target_compatible_with = ["@//tools/platforms/hardware:roborio"],
target_type = "roborio"):
"""Sets up the standard robot download targets.
@@ -15,7 +14,6 @@
Attrs:
start_binaries: A list of cc_binary targets to start on the robot.
dirs: Passed through to aos_downloader.
- default_target: Passed through to aos_downloader.
"""
aos_downloader(
@@ -28,7 +26,6 @@
] + binaries + data + ["//frc971/raspi/rootfs:chrt.sh"],
dirs = dirs,
target_type = target_type,
- default_target = default_target,
target_compatible_with = target_compatible_with,
)
@@ -43,6 +40,5 @@
] + [expand_label(binary) + ".stripped" for binary in binaries] + data + ["//frc971/raspi/rootfs:chrt.sh"],
dirs = dirs,
target_type = target_type,
- default_target = default_target,
target_compatible_with = target_compatible_with,
)
diff --git a/third_party/gperftools/BUILD b/third_party/gperftools/BUILD
index 3eaab4b..680654a 100644
--- a/third_party/gperftools/BUILD
+++ b/third_party/gperftools/BUILD
@@ -162,7 +162,6 @@
"-lrt",
"-lpthread",
],
- nocopts = "-std=gnu\\+\\+1y",
target_compatible_with = ["@platforms//os:linux"],
visibility = ["//visibility:public"],
deps = [
diff --git a/tools/rust/BUILD b/tools/rust/BUILD
index 707c40a..2095511 100644
--- a/tools/rust/BUILD
+++ b/tools/rust/BUILD
@@ -99,7 +99,6 @@
rust_std = ":empty_stdlib",
rustc = ":noop_error_exit",
rustc_lib = ":noop_error_exit",
- rustc_srcs = None,
rustfmt = ":noop_error_exit",
staticlib_ext = ".a",
stdlib_linkflags = [],