Merge commit 'ea7aeac570d63a673a082ba216fa119a156620b2' into HEAD
Upgrade glog. Sarah was using LOG_EVERY_T in
2b7e98861367daaccd5f8ac79be7f1d1d23af89e, and it
seemed about time that we upgraded.
This also brings in a fix from Brian to correctly handle
defines in autocxx_library.
Change-Id: I998f1c1f11b7a8b57e1906acdec1f5dd3c995111
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>
diff --git a/tools/build_rules/autocxx.bzl b/tools/build_rules/autocxx.bzl
index ee8b4d4..82d6d90 100644
--- a/tools/build_rules/autocxx.bzl
+++ b/tools/build_rules/autocxx.bzl
@@ -13,10 +13,14 @@
feature_configuration = feature_configuration,
action_name = ACTION_NAMES.cpp_compile,
)
+ preprocessor_defines = []
+ for lib in ctx.attr.libs:
+ preprocessor_defines.append(lib[CcInfo].compilation_context.defines)
compile_variables = cc_common.create_compile_variables(
feature_configuration = feature_configuration,
cc_toolchain = cc_toolchain,
user_compile_flags = ctx.fragments.cpp.copts + ctx.fragments.cpp.cxxopts,
+ preprocessor_defines = depset(transitive = preprocessor_defines),
)
command_line = cc_common.get_memory_inefficient_command_line(
feature_configuration = feature_configuration,