Remove dependencies on rules_cc (#1269)

This commit is contained in:
James Sharpe 2024-08-28 11:23:04 +01:00 committed by GitHub
parent d9367d28ad
commit 24e1bcfdeb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 12 deletions

View File

@ -15,6 +15,10 @@ bazel_dep(name = "rules_python", version = "0.23.1")
bazel_dep(name = "gazelle", version = "0.34.0", dev_dependency = True, repo_name = "bazel_gazelle") bazel_dep(name = "gazelle", version = "0.34.0", dev_dependency = True, repo_name = "bazel_gazelle")
bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True) bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True)
bazel_dep(name = "stardoc", version = "0.5.6", dev_dependency = True, repo_name = "io_bazel_stardoc") bazel_dep(name = "stardoc", version = "0.5.6", dev_dependency = True, repo_name = "io_bazel_stardoc")
bazel_dep(name = "bazel_ci_rules", version = "1.0.0", dev_dependency = True)
# note that this dev_dependency is only needed because bazel_ci_rules
# depends on it. If you are not using bazel_ci_rules; ideally we'd be able to remove this.
bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True) bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
python = use_extension("@rules_python//python/extensions:python.bzl", "python") python = use_extension("@rules_python//python/extensions:python.bzl", "python")

View File

@ -1,15 +1,6 @@
workspace(name = "rules_foreign_cc") workspace(name = "rules_foreign_cc")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_ci_rules//:rbe_repo.bzl", "rbe_preconfig")
http_archive(
name = "bazelci_rules",
sha256 = "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e",
strip_prefix = "bazelci_rules-1.0.0",
url = "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz",
)
load("@bazelci_rules//:rbe_repo.bzl", "rbe_preconfig")
# Creates a default toolchain config for RBE. # Creates a default toolchain config for RBE.
# Use this as is if you are using the rbe_ubuntu16_04 container, # Use this as is if you are using the rbe_ubuntu16_04 container,

View File

@ -17,6 +17,7 @@ bazel_dep(name = "rules_swift", version = "1.6.0", repo_name = "build_bazel_rule
bazel_dep(name = "rules_apple", version = "3.4.0", repo_name = "build_bazel_rules_apple") bazel_dep(name = "rules_apple", version = "3.4.0", repo_name = "build_bazel_rules_apple")
bazel_dep(name = "apple_support", version = "1.12.0", repo_name = "build_bazel_apple_support") bazel_dep(name = "apple_support", version = "1.12.0", repo_name = "build_bazel_apple_support")
bazel_dep(name = "rules_python", version = "0.23.0") bazel_dep(name = "rules_python", version = "0.23.0")
bazel_dep(name = "rules_cc", version = "0.0.9")
python = use_extension("@rules_python//python/extensions:python.bzl", "python") python = use_extension("@rules_python//python/extensions:python.bzl", "python")
python.toolchain( python.toolchain(

View File

@ -260,8 +260,6 @@ def _pkgconfig_toolchain(version, register_toolchains):
http_archive, http_archive,
name = "glib_dev", name = "glib_dev",
build_file_content = ''' build_file_content = '''
load("@rules_cc//cc:defs.bzl", "cc_library")
cc_import( cc_import(
name = "glib_dev", name = "glib_dev",
hdrs = glob(["include/**"]), hdrs = glob(["include/**"]),