diff --git a/bazel/glog.bzl b/bazel/glog.bzl index 3bb7485df..6f3bd7576 100644 --- a/bazel/glog.bzl +++ b/bazel/glog.bzl @@ -201,13 +201,10 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs): ":stl_logging_h", ":vlog_is_on_h", ], - strip_include_prefix = "src", + includes = ["src"], defines = final_lib_defines, copts = final_lib_copts, - deps = gflags_deps + select({ - "@bazel_tools//src/conditions:windows": [":strip_include_prefix_hack"], - "//conditions:default": [], - }), + deps = gflags_deps, **kwargs ) @@ -248,19 +245,6 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs): **kwargs ) - # Workaround https://github.com/bazelbuild/bazel/issues/6337 by declaring - # the dependencies without strip_include_prefix. - native.cc_library( - name = "strip_include_prefix_hack", - hdrs = [ - "src/glog/log_severity.h", - ":logging_h", - ":raw_logging_h", - ":stl_logging_h", - ":vlog_is_on_h", - ], - ) - expand_template( name = "config_h", template = "src/config.h.cmake.in",