cassdlcm/mediapipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that -std=c++14/17 is the first argument passed to Glog

Browse Source 
PiperOrigin-RevId: 552509553
This commit is contained in:
Sebastian Schmidt 2023-07-31 09:45:05 -07:00 committed by Copybara-Service
parent 81cf7fa173
commit d392f8ad98
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
third_party/com_github_glog_glog.diff vendored
View File

@ -41,7 +41,7 @@ index 4028ccc..483e639 100644
// It's 99.44% certain that we don't need to worry about doing this. // It's 99.44% certain that we don't need to worry about doing this.
diff --git a/bazel/glog.bzl b/bazel/glog.bzl diff --git a/bazel/glog.bzl b/bazel/glog.bzl
index dacd934..b56a6b9 100644 index dacd934..d7b3d78 100644
--- a/bazel/glog.bzl --- a/bazel/glog.bzl
+++ b/bazel/glog.bzl +++ b/bazel/glog.bzl
@@ -53,7 +53,6 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs): @@ -53,7 +53,6 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
@ -52,19 +52,17 @@ index dacd934..b56a6b9 100644
"-DGLOG_BAZEL_BUILD", "-DGLOG_BAZEL_BUILD",
# Inject a C++ namespace. # Inject a C++ namespace.
"-DGOOGLE_NAMESPACE='%s'" % namespace, "-DGOOGLE_NAMESPACE='%s'" % namespace,
@@ -83,6 +82,7 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs): @@ -145,7 +144,13 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
] ],
})
linux_or_darwin_copts = wasm_copts + [ + c14_opts = ["-std=c++14"]
+ "-std=c++14", + c17_opts = ["-std=c++17"]
"-DGLOG_EXPORT=__attribute__((visibility(\\\"default\\\")))", +
# For src/utilities.cc. final_lib_copts = select({
"-DHAVE_SYS_SYSCALL_H", + "@bazel_tools//src/conditions:windows": c17_opts,
@@ -110,6 +110,7 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs): + "//conditions:default": c14_opts,
] + }) + select({
"@bazel_tools//src/conditions:windows": common_copts + windows_only_copts,
windows_only_copts = [ "@bazel_tools//src/conditions:darwin": common_copts + linux_or_darwin_copts + darwin_only_copts,
+ "-std=c++17", "@bazel_tools//src/conditions:freebsd": common_copts + linux_or_darwin_copts + freebsd_only_copts,
# Override -DGLOG_EXPORT= from the cc_library's defines.
"-DGLOG_EXPORT=__declspec(dllexport)",
"-DGLOG_NO_ABBREVIATED_SEVERITIES",