From b378ad145417538d621786a7763840f00f350781 Mon Sep 17 00:00:00 2001 From: Krzysztof Naglik Date: Tue, 4 Apr 2023 12:52:40 +0200 Subject: [PATCH 1/3] Add gcc-5 constraint value --- cc/constraints/BUILD.bazel | 5 +++++ cc/copts.bzl | 1 + cc/defs.bzl | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cc/constraints/BUILD.bazel b/cc/constraints/BUILD.bazel index 2dbc0e53..ee173d98 100644 --- a/cc/constraints/BUILD.bazel +++ b/cc/constraints/BUILD.bazel @@ -4,6 +4,11 @@ package(default_visibility = ["//visibility:public"]) constraint_setting(name = "compiler") +constraint_value( + name = "gcc-5", + constraint_setting = ":compiler", +) + constraint_value( name = "gcc-6", constraint_setting = ":compiler", diff --git a/cc/copts.bzl b/cc/copts.bzl index 77cee0ad..17ef2e65 100644 --- a/cc/copts.bzl +++ b/cc/copts.bzl @@ -48,3 +48,4 @@ DEFAULT_COPTS = [ GCC6_DISABLED_COPTS = ["-Wimplicit-fallthrough"] GCC6_COPTS = [copt for copt in DEFAULT_COPTS if copt not in GCC6_DISABLED_COPTS] +GCC5_COPTS = GCC6_COPTS diff --git a/cc/defs.bzl b/cc/defs.bzl index d2cf0a06..7a0f60f5 100644 --- a/cc/defs.bzl +++ b/cc/defs.bzl @@ -12,7 +12,7 @@ load("//tools:stamp_file.bzl", "stamp_file") load(":utils.bzl", "construct_local_include") -load(":copts.bzl", "DEFAULT_COPTS", "GCC6_COPTS") +load(":copts.bzl", "DEFAULT_COPTS", "GCC5_COPTS", "GCC6_COPTS") load(":cc_static_library.bzl", _cc_static_library = "cc_static_library") # Name for a unit test @@ -49,6 +49,7 @@ def _cxx_standard(default, override): def _common_cc_opts(nocopts, pedantic = False): return select({ Label("//cc/constraints:gcc-6"): [copt for copt in GCC6_COPTS if copt not in nocopts], + Label("//cc/constraints:gcc-5"): [copt for copt in GCC5_COPTS if copt not in nocopts], "//conditions:default": [copt for copt in DEFAULT_COPTS if copt not in nocopts], }) + ["-pedantic"] if pedantic else [] From e23d9793f4566ac11053a483f3805482ca8991a2 Mon Sep 17 00:00:00 2001 From: Krzysztof Naglik Date: Tue, 4 Apr 2023 17:44:19 +0200 Subject: [PATCH 2/3] Forward visibility in cc_static_libarary --- cc/defs.bzl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cc/defs.bzl b/cc/defs.bzl index 7a0f60f5..2cc9a54c 100644 --- a/cc/defs.bzl +++ b/cc/defs.bzl @@ -124,7 +124,7 @@ def cc_stamped_library(name, out, template, hdrs, includes, defaults, visibility visibility = visibility, ) -def cc_static_library(name, deps): +def cc_static_library(name, deps, visibility): _cc_static_library( name = name, deps = deps, @@ -133,6 +133,7 @@ def cc_static_library(name, deps): "@platforms//os:macos": ["@platforms//:incompatible"], "//conditions:default": [], }), + visibility = visibility, ) def swift_c_library(**kwargs): From 692b1e62a8f9b40c060d4da16d36b06681d4626e Mon Sep 17 00:00:00 2001 From: Krzysztof Naglik Date: Thu, 6 Apr 2023 16:17:43 +0200 Subject: [PATCH 3/3] Set default value for visibility --- cc/defs.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cc/defs.bzl b/cc/defs.bzl index d4aebd4e..325de3f4 100644 --- a/cc/defs.bzl +++ b/cc/defs.bzl @@ -138,7 +138,7 @@ def cc_stamped_library(name, out, template, hdrs, includes, defaults, visibility visibility = visibility, ) -def cc_static_library(name, deps, visibility): +def cc_static_library(name, deps, visibility = ["//visibility:private"]): _cc_static_library( name = name, deps = deps,