From 837e5feed286d2fdd53678e649091e541e7a40bd Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 1 Mar 2019 22:52:18 -0800
Subject: [PATCH] Patch absl to work around nvcc bug on windows.

PiperOrigin-RevId: 236429734
---
 tensorflow/opensource_only.files |  1 +
 tensorflow/workspace.bzl         |  1 +
 third_party/absl/BUILD           |  0
 third_party/absl/absl-nvcc.patch | 13 +++++++++++++
 4 files changed, 15 insertions(+)
 create mode 100644 third_party/absl/BUILD
 create mode 100644 third_party/absl/absl-nvcc.patch

diff --git a/tensorflow/opensource_only.files b/tensorflow/opensource_only.files
index 3be09b70f17..369772e5594 100644
--- a/tensorflow/opensource_only.files
+++ b/tensorflow/opensource_only.files
@@ -221,6 +221,7 @@ tensorflow/third_party/astor.BUILD
 tensorflow/third_party/grpc/BUILD
 tensorflow/third_party/curl.BUILD
 tensorflow/third_party/arm_neon_2_x86_sse.BUILD
+tensorflow/third_party/absl/BUILD
 tensorflow/third_party/png.BUILD
 tensorflow/third_party/googleapis.BUILD
 tensorflow/third_party/mpi_collectives/BUILD
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index b5667cd4d15..058f67575a2 100755
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -128,6 +128,7 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
     tf_http_archive(
         name = "com_google_absl",
         build_file = clean_dep("//third_party:com_google_absl.BUILD"),
+        patch_file = clean_dep("//third_party/absl:absl-nvcc.patch"),
         sha256 = "c19386566a66fc0389d7ec70c0ffc398f037844c92c694ea7bc687929202e4eb",
         strip_prefix = "abseil-cpp-b312c3cb53a0aad75a85ac2bf57c4a614fbd48d4",
         urls = [
diff --git a/third_party/absl/BUILD b/third_party/absl/BUILD
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/third_party/absl/absl-nvcc.patch b/third_party/absl/absl-nvcc.patch
new file mode 100644
index 00000000000..76cdcce6a13
--- /dev/null
+++ b/third_party/absl/absl-nvcc.patch
@@ -0,0 +1,13 @@
+diff --git a/absl/base/config.h b/absl/base/config.h
+index db4c453..83a3133 100644
+--- a/absl/base/config.h
++++ b/absl/base/config.h
+@@ -127,7 +127,7 @@
+     (!defined(__clang__) && defined(__GNUC__) &&                 \
+      (__GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)) && \
+      (defined(_LIBCPP_VERSION) || defined(__GLIBCXX__))) ||      \
+-    defined(_MSC_VER)
++    (defined(_MSC_VER) && !defined(__NVCC__))
+ #define ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE 1
+ #define ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE 1
+ #endif