From 246ac732b8a3b7737efc38914dd2280e5164d563 Mon Sep 17 00:00:00 2001 From: Kristina Chodorow Date: Tue, 31 Jan 2017 10:03:51 -0500 Subject: Update proto library reference and make curl forward/backward compatible I'm working on fixing https://github.com/bazelbuild/bazel/issues/1681, which will change the way Bazel organizes the execution root. This has two implications for tensorflow: * The protobuf library needs to be updated to a version that works with old/new versions of Bazel (older versions won't be able to find external protos). * The curl library needs to use ../curl as an include prefix in new versions of Bazel and external/curl in old versions. This patch should be forward/backward compatible. --- third_party/curl.BUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'third_party/curl.BUILD') diff --git a/third_party/curl.BUILD b/third_party/curl.BUILD index c1c0f69dc0..a4d017feb8 100644 --- a/third_party/curl.BUILD +++ b/third_party/curl.BUILD @@ -232,7 +232,7 @@ cc_library( ], copts = select({ ":windows": [ - "/Iexternal/curl/lib", + "/I{%prefix%}/curl/lib", "/DHAVE_CONFIG_H", "/DCURL_DISABLE_FTP", "/DCURL_DISABLE_NTLM", @@ -245,7 +245,7 @@ cc_library( "/D_USING_V110_SDK71_", ], "//conditions:default": [ - "-Iexternal/curl/lib", + "-I{%prefix%}/curl/lib", "-D_GNU_SOURCE", "-DHAVE_CONFIG_H", "-DCURL_DISABLE_FTP", @@ -387,12 +387,12 @@ cc_binary( ], copts = select({ ":windows": [ - "/Iexternal/curl/lib", + "/I{%prefix%}/curl/lib", "/DHAVE_CONFIG_H", "/DCURL_DISABLE_LIBCURL_OPTION", ], "//conditions:default": [ - "-Iexternal/curl/lib", + "-I{%prefix%}/curl/lib", "-D_GNU_SOURCE", "-DHAVE_CONFIG_H", "-DCURL_DISABLE_LIBCURL_OPTION", -- cgit v1.2.3