Upgrade to bazel 7

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>

Author: ddelnano

.bazelrc

@@ -1,5 +1,7 @@
 # Global bazelrc file, see https://docs.bazel.build/versions/master/guide.html#bazelrc.
 
+common --noenable_bzlmod --enable_workspace
+
 # Use strict action env to prevent leaks of env vars.
 build --incompatible_strict_action_env
 

.bazelversion

@@ -1 +1 @@
-6.5.0
+7.7.1

WORKSPACE

@@ -23,6 +23,10 @@ load("@bazel_features//:deps.bzl", "bazel_features_deps")
 
 bazel_features_deps()
 
+load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
+
+compatibility_proxy_repo()
+
 # Order is important. Try to go from most basic/primitive to higher level packages.
 # - go_rules_dependencies
 # - protobuf_deps

bazel/cc_toolchains/sysroots/images.bzl

@@ -65,7 +65,6 @@ def _sysroot_variant_image_factory(variant):
         return _image_from_sysroot_info(ctx, sysroot_toolchain.sysroot)
 
     return rule(
-        name = "sysroot_{variant}_image".format(variant = variant),
         implementation = _impl,
         attrs = dicts.add(_container.image.attrs, {
             "default_image": attr.label(mandatory = True, doc = "Default container_image to use if no sysroot toolchain is found"),

bazel/cc_toolchains/toolchain_features.bzl

@@ -66,9 +66,10 @@ def pl_toolchain_pre_features(ctx):
 # pl_toolchain_post_features are added to the command line after all of the default features.
 def pl_toolchain_post_features(ctx):
     features = []
-    features += _libstdcpp(ctx)
     if ctx.attr.compiler == "clang":
         features += _clang_features(ctx)
+    else:
+        features += _libstdcpp(ctx)
 
     features += _external_dep(ctx)
 
@@ -148,6 +149,10 @@ def _libcpp(ctx):
     return [
         feature(
             name = "libc++",
+            # Enable by default for clang toolchains since they bundle libc++ and don't have libstdc++.
+            # This is especially important for exec toolchains where --features=libc++ from bazelrc
+            # may not be applied in Bazel 7+.
+            enabled = True,
             flag_sets = [
                 flag_set(
                     actions = all_cpp_compile_actions + [ACTION_NAMES.lto_backend],

bazel/cc_toolchains/unix_cc_toolchain_config.patch

@@ -1,35 +1,36 @@
-diff --color -Naur a/cc_toolchain_config.bzl b/cc_toolchain_config.bzl
---- a/cc_toolchain_config.bzl	2023-01-06 15:34:50.000000000 -0800
-+++ b/cc_toolchain_config.bzl	2023-01-22 15:33:16.794758043 -0800
-@@ -27,6 +27,7 @@
+diff --git a/cc_toolchain_config.bzl b/cc_toolchain_config.bzl
+index 0b77afc..a046faf 100644
+--- a/cc_toolchain_config.bzl
++++ b/cc_toolchain_config.bzl
+@@ -27,6 +27,7 @@ load(
      "with_feature_set",
  )
  load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES")
 +load(":toolchain_features.bzl", "pl_toolchain_pre_features", "PL_EXTRA_CC_CONFIG_ATTRS", "pl_toolchain_post_features", "pl_action_configs")
- 
+
  def layering_check_features(compiler):
      if compiler != "clang":
-@@ -147,7 +148,7 @@
+@@ -147,7 +148,7 @@ def _impl(ctx):
          tool_path(name = name, path = path)
          for name, path in ctx.attr.tool_paths.items()
      ]
 -    action_configs = []
 +    action_configs = pl_action_configs(ctx)
- 
+
      llvm_cov_action = action_config(
          action_name = ACTION_NAMES.llvm_cov,
-@@ -168,6 +169,10 @@
+@@ -168,6 +169,10 @@ def _impl(ctx):
          name = "supports_start_end_lib",
          enabled = True,
      )
 +    default_opt_level_flags_feature = feature(
 +        name = "default_opt_level_flags",
 +        enabled = True,
 +    )
- 
+
      default_compile_flags_feature = feature(
          name = "default_compile_flags",
-@@ -203,7 +208,7 @@
+@@ -203,7 +208,7 @@ def _impl(ctx):
                          flags = ctx.attr.dbg_compile_flags,
                      ),
                  ] if ctx.attr.dbg_compile_flags else []),
@@ -38,7 +39,7 @@ diff --color -Naur a/cc_toolchain_config.bzl b/cc_toolchain_config.bzl
              ),
              flag_set(
                  actions = all_compile_actions,
-@@ -212,7 +217,7 @@
+@@ -212,7 +217,7 @@ def _impl(ctx):
                          flags = ctx.attr.opt_compile_flags,
                      ),
                  ] if ctx.attr.opt_compile_flags else []),
@@ -47,7 +48,7 @@ diff --color -Naur a/cc_toolchain_config.bzl b/cc_toolchain_config.bzl
              ),
              flag_set(
                  actions = all_cpp_compile_actions + [ACTION_NAMES.lto_backend],
-@@ -244,7 +249,7 @@
+@@ -244,7 +249,7 @@ def _impl(ctx):
                          flags = ctx.attr.opt_link_flags,
                      ),
                  ] if ctx.attr.opt_link_flags else []),
@@ -56,44 +57,57 @@ diff --color -Naur a/cc_toolchain_config.bzl b/cc_toolchain_config.bzl
              ),
          ],
      )
-@@ -1255,6 +1260,7 @@
+@@ -1255,6 +1260,7 @@ def _impl(ctx):
              strip_debug_symbols_feature,
              coverage_feature,
              supports_pic_feature,
 +            default_opt_level_flags_feature,
          ] + (
              [
                  supports_start_end_lib_feature,
-@@ -1276,6 +1282,7 @@
+@@ -1276,6 +1282,7 @@ def _impl(ctx):
      else:
          features = [
              supports_pic_feature,
 +            default_opt_level_flags_feature,
          ] + (
              [
                  supports_start_end_lib_feature,
-@@ -1294,6 +1301,7 @@
+@@ -1294,6 +1301,17 @@ def _impl(ctx):
              unfiltered_compile_flags_feature,
          ] + layering_check_features(ctx.attr.compiler)
- 
+
 +    features = pl_toolchain_pre_features(ctx) + features + pl_toolchain_post_features(ctx)
++
++    sysroot_path = ctx.attr.builtin_sysroot
++    # Only override with toolchain sysroot if this cc_toolchain is configured to use a sysroot
++    # (i.e., builtin_sysroot is non-empty). This prevents exec toolchains from incorrectly
++    # inheriting the target sysroot.
++    if sysroot_path:
++        sysroot_toolchain = ctx.toolchains["@px//bazel/cc_toolchains/sysroots/build:toolchain_type"]
++        if sysroot_toolchain:
++            sysroot_path = sysroot_toolchain.sysroot.path
++
      return cc_common.create_cc_toolchain_config_info(
          ctx = ctx,
          features = features,
-@@ -1313,7 +1321,7 @@
- 
+@@ -1308,7 +1322,7 @@ def _impl(ctx):
+         abi_version = ctx.attr.abi_version,
+         abi_libc_version = ctx.attr.abi_libc_version,
+         tool_paths = tool_paths,
+-        builtin_sysroot = ctx.attr.builtin_sysroot,
++        builtin_sysroot = sysroot_path,
+     )
+
  cc_toolchain_config = rule(
-     implementation = _impl,
--    attrs = {
-+    attrs = dict({
-         "cpu": attr.string(mandatory = True),
-         "compiler": attr.string(mandatory = True),
-         "toolchain_identifier": attr.string(mandatory = True),
-@@ -1336,6 +1344,6 @@
+@@ -1336,5 +1350,8 @@ cc_toolchain_config = rule(
          "coverage_link_flags": attr.string_list(),
          "supports_start_end_lib": attr.bool(),
          "builtin_sysroot": attr.string(),
 -    },
-+    }, **PL_EXTRA_CC_CONFIG_ATTRS),
++    } | PL_EXTRA_CC_CONFIG_ATTRS,
      provides = [CcToolchainConfigInfo],
++    toolchains = [
++        config_common.toolchain_type("@px//bazel/cc_toolchains/sysroots/build:toolchain_type", mandatory = False),
++    ],
  )

bazel/pl_build_system.bzl

@@ -95,7 +95,8 @@ def pl_common_linkopts():
             "-lunwind",
         ],
         # The OSX system library transitively links common libraries (e.g., pthread).
-        "@bazel_tools//tools/osx:darwin": [],
+        "@bazel_tools//tools/osx:darwin_arm64": [],
+        "@bazel_tools//tools/osx:darwin_x86_64": [],
         "//conditions:default": [
             "-pthread",
             "-lunwind",

bazel/repositories.bzl

@@ -247,6 +247,7 @@ def _pl_cc_toolchain_deps():
 def _pl_deps():
     _bazel_repo("bazel_gazelle")
     _bazel_repo("io_bazel_rules_go", patches = ["//bazel/external:rules_go.patch"], patch_args = ["-p1"])
+    _bazel_repo("rules_cc")
     _bazel_repo("rules_java")
     _bazel_repo("io_bazel_rules_scala")
     _bazel_repo("rules_scala")

bazel/repository_locations.bzl

@@ -23,10 +23,10 @@ REPOSITORY_LOCATIONS = dict(
         ],
     ),
     bazel_skylib = dict(
-        sha256 = "f7be3474d42aae265405a592bb7da8e171919d74c16f082a5457840f06054728",
+        sha256 = "51b5105a760b353773f904d2bbc5e664d0987fbaf22265164de65d43e910d8ac",
         urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz",
-            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz",
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.8.1/bazel-skylib-1.8.1.tar.gz",
+            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.8.1/bazel-skylib-1.8.1.tar.gz",
         ],
     ),
     # Must be called boringssl to make sure the deps pick it up correctly.
@@ -415,6 +415,11 @@ REPOSITORY_LOCATIONS = dict(
         ],
         manual_license_name = "oracle/openjdk",
     ),
+    rules_cc = dict(
+	sha256 = "a2fdfde2ab9b2176bd6a33afca14458039023edb1dd2e73e6823810809df4027",
+	strip_prefix = "rules_cc-0.2.14",
+	urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.2.14/rules_cc-0.2.14.tar.gz"],
+    ),
     io_bazel_rules_closure = dict(
         sha256 = "5b00383d08dd71f28503736db0500b6fb4dda47489ff5fc6bed42557c07c6ba9",
         strip_prefix = "rules_closure-308b05b2419edb5c8ee0471b67a40403df940149",