No public description

PiperOrigin-RevId: 568660415
2023-09-26 15:14:16 -07:00
parent 0417817886
commit 3134625508
4 changed files with 46 additions and 16 deletions
@@ -0,0 +1,26 @@
+diff --git a/bazel/glog.bzl b/bazel/glog.bzl
+index dacd934..d7b3d78 100644
+--- a/bazel/glog.bzl
+++ b/bazel/glog.bzl
+@@ -53,7 +53,6 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
+     )
+ 
+     common_copts = [
+-        "-std=c++14",
+         "-DGLOG_BAZEL_BUILD",
+         # Inject a C++ namespace.
+         "-DGOOGLE_NAMESPACE='%s'" % namespace,
+@@ -145,7 +144,13 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
+         ],
+     })
+ 
+    c14_opts = ["-std=c++14"]
+    c17_opts = ["-std=c++17"]
+
+     final_lib_copts = select({
+        "@bazel_tools//src/conditions:windows": c17_opts,
+         "//conditions:default": c14_opts,
+    }) + select({
+         "@bazel_tools//src/conditions:windows": common_copts + windows_only_copts,
+         "@bazel_tools//src/conditions:darwin": common_copts + linux_or_darwin_copts + darwin_only_copts,
+         "@bazel_tools//src/conditions:freebsd": common_copts + linux_or_darwin_copts + freebsd_only_copts,