From 89232a118939dbda05a95bf0a9fb5ceb95fe733e Mon Sep 17 00:00:00 2001 From: Jin Suk Park Date: Tue, 7 May 2019 15:53:58 +0900 Subject: [PATCH] Fix build options for non transitive load. --- opencensus/copts.bzl | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/opencensus/copts.bzl b/opencensus/copts.bzl index 546ea8de..48482bca 100644 --- a/opencensus/copts.bzl +++ b/opencensus/copts.bzl @@ -23,14 +23,21 @@ We use the same flags as absl, plus turn some warnings into errors. load( "@com_google_absl//absl:copts/configure_copts.bzl", - "ABSL_GCC_FLAGS", - "ABSL_GCC_TEST_FLAGS", - "ABSL_LLVM_FLAGS", - "ABSL_LLVM_TEST_FLAGS", - "ABSL_MSVC_FLAGS", - "ABSL_MSVC_TEST_FLAGS", + _ABSL_GCC_FLAGS = "ABSL_GCC_FLAGS", + _ABSL_GCC_TEST_FLAGS = "ABSL_GCC_TEST_FLAGS", + _ABSL_LLVM_FLAGS = "ABSL_LLVM_FLAGS", + _ABSL_LLVM_TEST_FLAGS = "ABSL_LLVM_TEST_FLAGS", + _ABSL_MSVC_FLAGS = "ABSL_MSVC_FLAGS", + _ABSL_MSVC_TEST_FLAGS = "ABSL_MSVC_TEST_FLAGS", ) +ABSL_GCC_FLAGS = _ABSL_GCC_FLAGS +ABSL_GCC_TEST_FLAGS = _ABSL_GCC_TEST_FLAGS +ABSL_LLVM_FLAGS = _ABSL_LLVM_FLAGS +ABSL_LLVM_TEST_FLAGS = _ABSL_LLVM_TEST_FLAGS +ABSL_MSVC_FLAGS = _ABSL_MSVC_FLAGS +ABSL_MSVC_TEST_FLAGS = _ABSL_MSVC_TEST_FLAGS + WERROR = ["-Werror=return-type", "-Werror=switch"] DEFAULT_COPTS = select({