luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add workaround for Bazel build on macOS

Browse Source 
This works around https://github.com/bazelbuild/bazel/issues/3979,
and so closes #282.
This commit is contained in:
Rodrigo Queiro 2018-01-16 09:20:08 +01:00 committed by Rodrigo Queiro
parent 028d37889a
commit 3106945d8d
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bazel/glog.bzl
View File

@ -53,9 +53,8 @@ def glog_library(namespace='google', with_gflags=1):
'-Wno-unused-function', '-Wno-unused-function',
'-Wno-unused-local-typedefs', '-Wno-unused-local-typedefs',
'-Wno-unused-variable', '-Wno-unused-variable',
"-DGLOG_BAZEL_BUILD",
# Inject a C++ namespace. # Inject a C++ namespace.
"-D_START_GOOGLE_NAMESPACE_='namespace %s {'" % namespace,
"-D_END_GOOGLE_NAMESPACE_='}'",
"-DGOOGLE_NAMESPACE='%s'" % namespace, "-DGOOGLE_NAMESPACE='%s'" % namespace,
# Allows src/base/mutex.h to include pthread.h. # Allows src/base/mutex.h to include pthread.h.
'-DHAVE_PTHREAD', '-DHAVE_PTHREAD',

12
src/config.h.cmake.in
View File

@ -180,8 +180,20 @@
/* Version number of package */ /* Version number of package */
#cmakedefine VERSION #cmakedefine VERSION
#ifdef GLOG_BAZEL_BUILD
/* TODO(rodrigoq): remove this workaround once bazel#3979 is resolved:
* https://github.com/bazelbuild/bazel/issues/3979 */
#define _START_GOOGLE_NAMESPACE_ namespace GOOGLE_NAMESPACE {
#define _END_GOOGLE_NAMESPACE_ }
#else
/* Stops putting the code inside the Google namespace */ /* Stops putting the code inside the Google namespace */
#cmakedefine _END_GOOGLE_NAMESPACE_ ${_END_GOOGLE_NAMESPACE_} #cmakedefine _END_GOOGLE_NAMESPACE_ ${_END_GOOGLE_NAMESPACE_}
/* Puts following code inside the Google namespace */ /* Puts following code inside the Google namespace */
#cmakedefine _START_GOOGLE_NAMESPACE_ ${_START_GOOGLE_NAMESPACE_} #cmakedefine _START_GOOGLE_NAMESPACE_ ${_START_GOOGLE_NAMESPACE_}
#endif