diff --git a/.bazelrc b/.bazelrc index 6532c3cafd9..2b925ab17ac 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1 +1,6 @@ +# Remove once #5066 is resolved. +common --enable_workspace +# Enable once #5066 is resolved. +common --noenable_bzlmod + build --action_env=BAZEL_CXXOPTS="-std=c++17" diff --git a/.bazelversion b/.bazelversion index 19b860c1872..815da58b7a9 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -6.4.0 +7.4.1 diff --git a/bazel/example/.bazelrc b/bazel/example/.bazelrc index 6532c3cafd9..2b925ab17ac 100644 --- a/bazel/example/.bazelrc +++ b/bazel/example/.bazelrc @@ -1 +1,6 @@ +# Remove once #5066 is resolved. +common --enable_workspace +# Enable once #5066 is resolved. +common --noenable_bzlmod + build --action_env=BAZEL_CXXOPTS="-std=c++17" diff --git a/bazel/example/.bazelversion b/bazel/example/.bazelversion index 19b860c1872..815da58b7a9 100644 --- a/bazel/example/.bazelversion +++ b/bazel/example/.bazelversion @@ -1 +1 @@ -6.4.0 +7.4.1 diff --git a/bazel/example/WORKSPACE.bazel b/bazel/example/WORKSPACE.bazel index 4be9dfe7230..0ea8a56e92d 100644 --- a/bazel/example/WORKSPACE.bazel +++ b/bazel/example/WORKSPACE.bazel @@ -7,7 +7,8 @@ local_repository( # This part is optional: only needed for custom backends with IR extensions. repo_mapping = { # Tells p4c where to look for `:ir_extension` target: in this project. - "@com_github_p4lang_p4c_extension": "@example_p4_project", + # The main repo has no name, so a bare `@` means this repository. + "@com_github_p4lang_p4c_extension": "@", }, )