diff options
| author |  Andrew Harp <andrewharp@google.com> | 2017-03-01 17:59:22 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-03-01 18:08:24 -0800 |
| commit | 3e975ea978bac4d861bb09328b06f3c316212611 (patch) | |
| tree | 79bac044c9723df8443495eb962c2dd98a2ed421 /third_party/curl.BUILD | |
| parent | 8043a27ed77f59bb68409070f2bfa01df0e04b89 (diff) | |
Merge changes from github.
Change: 148954491
Diffstat (limited to 'third_party/curl.BUILD')
| -rw-r--r-- | third_party/curl.BUILD | 46 |
1 files changed, 13 insertions, 33 deletions
diff --git a/third_party/curl.BUILD b/third_party/curl.BUILD index dde8e6cdb7..557c2885eb 100644 --- a/third_party/curl.BUILD +++ b/third_party/curl.BUILD @@ -204,13 +204,13 @@ cc_library( "lib/wildcard.h", "lib/x509asn1.h", ] + select({ - ":darwin": [ + "@//tensorflow:darwin": [ "lib/vtls/darwinssl.c", ], - ":ios": [ + "@//tensorflow:ios": [ "lib/vtls/darwinssl.c", ], - ":windows": [ + "@//tensorflow:windows": [ "lib/asyn-thread.c", "lib/inet_ntop.c", "lib/system_win32.c", @@ -231,7 +231,7 @@ cc_library( "include/curl/typecheck-gcc.h", ], copts = select({ - ":windows": [ + "@//tensorflow:windows": [ "/I%prefix%/curl/lib", "/DHAVE_CONFIG_H", "/DCURL_DISABLE_FTP", @@ -255,10 +255,10 @@ cc_library( "-Wno-string-plus-int", ], }) + select({ - ":darwin": [ + "@//tensorflow:darwin": [ "-fno-constant-cfstrings", ], - ":windows": [ + "@//tensorflow:windows": [ # See curl.h for discussion of write size and Windows "/DCURL_MAX_WRITE_SIZE=16384", ], @@ -268,17 +268,17 @@ cc_library( }), includes = ["include"], linkopts = select({ - ":android": [ + "@//tensorflow:android": [ "-pie", ], - ":darwin": [ + "@//tensorflow:darwin": [ "-Wl,-framework", "-Wl,CoreFoundation", "-Wl,-framework", "-Wl,Security", ], - ":ios": [], - ":windows": [ + "@//tensorflow:ios": [], + "@//tensorflow:windows": [ "ws2_32.lib", ], "//conditions:default": [ @@ -289,8 +289,8 @@ cc_library( deps = [ "@zlib_archive//:zlib", ] + select({ - ":ios": [], - ":windows": [], + "@//tensorflow:ios": [], + "@//tensorflow:windows": [], "//conditions:default": [ "@boringssl//:ssl", ], @@ -386,7 +386,7 @@ cc_binary( "src/tool_xattr.h", ], copts = select({ - ":windows": [ + "@//tensorflow:windows": [ "/I%prefix%/curl/lib", "/DHAVE_CONFIG_H", "/DCURL_DISABLE_LIBCURL_OPTION", @@ -657,23 +657,3 @@ genrule( "EOF", ]), ) - -config_setting( - name = "ios", - values = {"crosstool_top": "//tools/osx/crosstool:crosstool"}, -) - -config_setting( - name = "darwin", - values = {"cpu": "darwin"}, -) - -config_setting( - name = "windows", - values = {"cpu": "x64_windows_msvc"}, -) - -config_setting( - name = "android", - values = {"crosstool_top": "//external:android/crosstool"}, -) |