Merge 203f7f6 into 05f5b89

jupp0r · Oct 17, 2019 · 5edc5ef · 5edc5ef
2 parents 05f5b89 + 203f7f6
commit 5edc5ef
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/core/BUILD.bazel b/core/BUILD.bazel
@@ -7,8 +7,8 @@ cc_library(
     hdrs = glob(
         ["include/**/*.h"],
     ),
-    copts = [
-        "-DPROMETHEUS_CPP_COMPILE_CORE",
+    local_defines = [
+        "PROMETHEUS_CPP_COMPILE_CORE",
     ],
     strip_include_prefix = "include",
     visibility = ["//visibility:public"],

diff --git a/core/benchmarks/BUILD.bazel b/core/benchmarks/BUILD.bazel
@@ -4,7 +4,7 @@ cc_binary(
         "*.cc",
         "*.h",
     ]),
-    linkstatic = 1,
+    linkstatic = True,
     deps = [
         "//core",
         "@com_github_google_benchmark//:benchmark",

diff --git a/core/tests/BUILD.bazel b/core/tests/BUILD.bazel
@@ -5,7 +5,7 @@ cc_test(
         "*.h",
     ]),
     copts = ["-Iexternal/googletest/include"],
-    linkstatic = 1,
+    linkstatic = True,
     deps = [
         "//core",
         "@com_google_googletest//:gtest_main",

diff --git a/pull/BUILD.bazel b/pull/BUILD.bazel
@@ -7,9 +7,9 @@ cc_library(
     hdrs = glob(
         ["include/**/*.h"],
     ),
-    copts = [
-        "-DHAVE_ZLIB",
-        "-DPROMETHEUS_CPP_COMPILE_PULL",
+    local_defines = [
+        "HAVE_ZLIB",
+        "PROMETHEUS_CPP_COMPILE_PULL",
     ],
     strip_include_prefix = "include",
     visibility = ["//visibility:public"],

diff --git a/push/BUILD.bazel b/push/BUILD.bazel
@@ -7,14 +7,14 @@ cc_library(
     hdrs = glob(
         ["include/**/*.h"],
     ),
-    copts = [
-        "-DPROMETHEUS_CPP_COMPILE_PUSH",
-    ],
     linkopts = select({
         "//:windows": [],
         "//:windows_msvc": [],
         "//conditions:default": ["-lpthread"],
     }),
+    local_defines = [
+        "PROMETHEUS_CPP_COMPILE_PUSH",
+    ],
     strip_include_prefix = "include",
     visibility = ["//visibility:public"],
     deps = [