[bazel] Add fixes for --incompatible_load_cc_rules_from_bzl (#351)

* [bazel] Add fixes for --incompatible_load_cc_rules_from_bzl Starting with Bazel 1.0 (September 2019), C++ rules will need to be loaded from the @rules_cc repository. This change adds the required loads for that. For full compatibility, we will need versions of googletest and google-benchmark that also includes these loads. * Run buildifier again after merge
5 years ago · 36910d3d7e
parent aae8143cf9
commit 36910d3d7e
18 changed files with 33 additions and 3 deletions
--- a/11
+++ b/11
@ -27,3 +27,14 @@ http_archive(
    strip_prefix = "benchmark-16703ff83c1ae6d53e5155df3bb3ab0bc96083be",
    sha256 = "59f918c8ccd4d74b6ac43484467b500f1d64b40cc1010daa055375b322a43ba3",
 )
+
+# C++ rules for Bazel.
+http_archive(
+    name = "rules_cc",
+    sha256 = "67412176974bfce3f4cf8bdaff39784a72ed709fc58def599d1f68710b58d68b",
+    strip_prefix = "rules_cc-b7fe9697c0c76ab2fd431a891dbb9a6a32ed7c3e",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b7fe9697c0c76ab2fd431a891dbb9a6a32ed7c3e.zip",
+        "https://github.com/bazelbuild/rules_cc/archive/b7fe9697c0c76ab2fd431a891dbb9a6a32ed7c3e.zip",
+    ],
+)
--- a/absl/algorithm/BUILD.bazel
+++ b/absl/algorithm/BUILD.bazel
@ -14,6 +14,7 @@
 # limitations under the License.
 #

+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
 load(
    "//absl:copts/configure_copts.bzl",
    "ABSL_DEFAULT_COPTS",
--- a/absl/base/BUILD.bazel
+++ b/absl/base/BUILD.bazel
@ -14,6 +14,7 @@
 # limitations under the License.
 #

+load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
 load(
    "//absl:copts/configure_copts.bzl",
    "ABSL_DEFAULT_COPTS",
--- a/absl/container/BUILD.bazel
+++ b/absl/container/BUILD.bazel
@ -14,6 +14,7 @@
 # limitations under the License.
 #

+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
 load(
    "//absl:copts/configure_copts.bzl",
    "ABSL_DEFAULT_COPTS",
--- a/absl/debugging/BUILD.bazel
+++ b/absl/debugging/BUILD.bazel
@ -14,6 +14,7 @@
 # limitations under the License.
 #

+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
 load(
    "//absl:copts/configure_copts.bzl",
    "ABSL_DEFAULT_COPTS",
--- a/absl/flags/BUILD.bazel
+++ b/absl/flags/BUILD.bazel
@ -14,6 +14,7 @@
 # limitations under the License.
 #

+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
 load(
    "//absl:copts/configure_copts.bzl",
    "ABSL_DEFAULT_COPTS",
--- a/absl/hash/BUILD.bazel
+++ b/absl/hash/BUILD.bazel
@ -14,6 +14,7 @@
 # limitations under the License.
 #

+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
 load(
    "//absl:copts/configure_copts.bzl",
    "ABSL_DEFAULT_COPTS",
--- a/absl/memory/BUILD.bazel
+++ b/absl/memory/BUILD.bazel
@ -14,13 +14,14 @@
 # limitations under the License.
 #

+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
 load(
    "//absl:copts/configure_copts.bzl",
    "ABSL_DEFAULT_COPTS",
    "ABSL_DEFAULT_LINKOPTS",
-    "ABSL_TEST_COPTS",
    "ABSL_EXCEPTIONS_FLAG",
    "ABSL_EXCEPTIONS_FLAG_LINKOPTS",
+    "ABSL_TEST_COPTS",
 )

 package(default_visibility = ["//visibility:public"])
--- a/absl/meta/BUILD.bazel
+++ b/absl/meta/BUILD.bazel
@ -1,3 +1,4 @@
+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
 load(
    "//absl:copts/configure_copts.bzl",
    "ABSL_DEFAULT_COPTS",
--- a/absl/numeric/BUILD.bazel
+++ b/absl/numeric/BUILD.bazel
@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
 load(
    "//absl:copts/configure_copts.bzl",
    "ABSL_DEFAULT_COPTS",
--- a/absl/random/BUILD.bazel
+++ b/absl/random/BUILD.bazel
@ -1,5 +1,6 @@
 # ABSL random-number generation libraries.

+load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
 load(
    "//absl:copts/configure_copts.bzl",
    "ABSL_DEFAULT_COPTS",
--- a/absl/random/internal/BUILD.bazel
+++ b/absl/random/internal/BUILD.bazel
@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
+
 # Internal-only implementation classes for Abseil Random
 load(
    "//absl:copts/configure_copts.bzl",
--- a/absl/strings/BUILD.bazel
+++ b/absl/strings/BUILD.bazel
@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
 load(
    "//absl:copts/configure_copts.bzl",
    "ABSL_DEFAULT_COPTS",
--- a/absl/synchronization/BUILD.bazel
+++ b/absl/synchronization/BUILD.bazel
@ -14,6 +14,7 @@
 # limitations under the License.
 #

+load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
 load(
    "//absl:copts/configure_copts.bzl",
    "ABSL_DEFAULT_COPTS",
--- a/absl/time/BUILD.bazel
+++ b/absl/time/BUILD.bazel
@ -14,6 +14,7 @@
 # limitations under the License.
 #

+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
 load(
    "//absl:copts/configure_copts.bzl",
    "ABSL_DEFAULT_COPTS",
--- a/absl/time/internal/cctz/BUILD.bazel
+++ b/absl/time/internal/cctz/BUILD.bazel
@ -12,6 +12,8 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.

+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
+
 package(features = ["-parse_headers"])

 licenses(["notice"])  # Apache License
@ -77,10 +79,10 @@ cc_library(
        "include/cctz/zone_info_source.h",
    ],
    linkopts = select({
-        ":osx": [
+        ":ios": [
            "-framework Foundation",
        ],
-        ":ios": [
+        ":osx": [
            "-framework Foundation",
        ],
        "//conditions:default": [],
--- a/absl/types/BUILD.bazel
+++ b/absl/types/BUILD.bazel
@ -14,6 +14,7 @@
 # limitations under the License.
 #

+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
 load(
    "//absl:copts/configure_copts.bzl",
    "ABSL_DEFAULT_COPTS",
--- a/absl/utility/BUILD.bazel
+++ b/absl/utility/BUILD.bazel
@ -1,3 +1,4 @@
+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
 load(
    "//absl:copts/configure_copts.bzl",
    "ABSL_DEFAULT_COPTS",