Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use generated config.h for Windows. #635

Merged
merged 1 commit into from
Apr 6, 2021
Merged

Use generated config.h for Windows. #635

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions bazel/glog.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
name = "glog",
visibility = ["//visibility:public"],
srcs = [
":config_h",
"src/base/commandlineflags.h",
"src/base/googleinit.h",
"src/base/mutex.h",
Expand All @@ -133,7 +134,7 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
"src/vlog_is_on.cc",
] + select({
"@bazel_tools//src/conditions:windows": windows_only_srcs,
"//conditions:default": [":config_h"],
"//conditions:default": [],
}),
hdrs = [
"src/glog/log_severity.h",
Expand All @@ -144,8 +145,8 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
],
strip_include_prefix = "src",
defines = select({
# We need to override the default GOOGLE_GLOG_DLL_DECL from
# src/glog/*.h to match src/windows/config.h.
# GOOGLE_GLOG_DLL_DECL is normally set by export.h, but that's not
# generated for Bazel.
"@bazel_tools//src/conditions:windows": ["GOOGLE_GLOG_DLL_DECL=__declspec(dllexport)"],
"//conditions:default": [],
}),
Expand Down