Fix issue 892

Signed-off-by: owent <admin@owent.net>
open-telemetry · Jul 7, 2021 · c73d029 · c73d029
1 parent 0563059
commit c73d029
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/bazel/curl.BUILD b/bazel/curl.BUILD
@@ -6,13 +6,17 @@ package(features = ["no_copts_tokenization"])
 
 config_setting(
     name = "windows",
-    values = {"cpu": "x64_windows"},
+    constraint_values = [
+        "@bazel_tools//platforms:windows",
+    ],
     visibility = ["//visibility:private"],
 )
 
 config_setting(
     name = "osx",
-    values = {"cpu": "darwin"},
+    constraint_values = [
+        "@bazel_tools//platforms:osx",
+    ],
     visibility = ["//visibility:private"],
 )
 
@@ -27,11 +31,27 @@ cc_library(
     ]),
     copts = CURL_COPTS + [
         "-DOS=\"os\"",
-        "-DCURL_EXTERN_SYMBOL=__attribute__((__visibility__(\"default\")))",
+        # "-DCURL_EXTERN_SYMBOL=__attribute__((__visibility__(\"default\")))",
     ],
+    defines = ["CURL_STATICLIB"],
     includes = [
         "include/",
         "lib/",
     ],
+    linkopts = select({
+        "//:windows": [
+            "-DEFAULTLIB:ws2_32.lib",
+            "-DEFAULTLIB:advapi32.lib",
+            "-DEFAULTLIB:crypt32.lib",
+            "-DEFAULTLIB:Normaliz.lib",
+        ],
+        "//:osx": [
+            "-framework SystemConfiguration",
+            "-lpthread",
+        ],
+        "//conditions:default": [
+            "-lpthread",
+        ],
+    }),
     visibility = ["//visibility:public"],
-)
+)
diff --git a/examples/http/BUILD b/examples/http/BUILD
@@ -6,7 +6,7 @@ cc_binary(
     ],
     # TODO: Move copts/linkopts for static CURL usage into shared bzl file.
     copts = [
-        "-DCURL_STATICLIB",
+        # "-DCURL_STATICLIB",
         "-DWITH_CURL",
     ],
     linkopts = select({

diff --git a/exporters/elasticsearch/BUILD b/exporters/elasticsearch/BUILD
@@ -9,9 +9,9 @@ cc_library(
         "include/opentelemetry/exporters/elasticsearch/es_log_exporter.h",
         "include/opentelemetry/exporters/elasticsearch/es_log_recordable.h",
     ],
-    copts = [
-        "-DCURL_STATICLIB",
-    ],
+    # copts = [
+    #     "-DCURL_STATICLIB",
+    # ],
     linkopts = select({
         "//bazel:windows": [
             "-DEFAULTLIB:advapi32.lib",

diff --git a/ext/src/http/client/curl/BUILD b/ext/src/http/client/curl/BUILD
@@ -8,7 +8,7 @@ cc_library(
     ],
     # TODO: Move copts/linkopts for static CURL usage into shared bzl file.
     copts = [
-        "-DCURL_STATICLIB",
+        # "-DCURL_STATICLIB",
         "-DWITH_CURL",
     ],
     include_prefix = "src/http/client/curl",

diff --git a/ext/test/w3c_tracecontext_test/BUILD b/ext/test/w3c_tracecontext_test/BUILD
@@ -4,9 +4,9 @@ cc_binary(
         "main.cc",
     ],
     # TODO: Move copts/linkopts for static CURL usage into shared bzl file.
-    copts = [
-        "-DCURL_STATICLIB",
-    ],
+    # copts = [
+    #     "-DCURL_STATICLIB",
+    # ],
     linkopts = select({
         "//bazel:windows": [
             "-DEFAULTLIB:advapi32.lib",