From 86ad3363e18f7df3f86f30150f7b13d389c459e5 Mon Sep 17 00:00:00 2001
From: Loo Rong Jie <loorongjie@gmail.com>
Date: Wed, 4 Jul 2018 19:32:20 +0800
Subject: [PATCH] Suppress /wd4577 'noexcept with no exception handling mode'
 warning

---
 tensorflow/contrib/cmake/CMakeLists.txt | 2 ++
 tensorflow/tensorflow.bzl               | 1 +
 2 files changed, 3 insertions(+)

diff --git a/tensorflow/contrib/cmake/CMakeLists.txt b/tensorflow/contrib/cmake/CMakeLists.txt
index 693393c1e75..708618dcb04 100644
--- a/tensorflow/contrib/cmake/CMakeLists.txt
+++ b/tensorflow/contrib/cmake/CMakeLists.txt
@@ -177,6 +177,8 @@ if(WIN32)
     string(REPLACE "/EHsc" "/EHs-c-" ${flag} "${${flag}}")
   endforeach()
   add_definitions(/D_HAS_EXCEPTIONS=0)
+  # Suppress 'noexcept used with no exception handling mode specified' warning
+  add_compile_options(/wd4577)
 
   # Try to avoid flaky failures due to failed generation of generate.stamp files.
   set(CMAKE_SUPPRESS_REGENERATION ON)
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index c3bd854940a..46d554a19de 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -186,6 +186,7 @@ def get_win_copts(is_external=False):
         # Bazel to fix this.
         # "/D_HAS_EXCEPTIONS=0",
         # "/EHs-c-",
+        "/wd4577",
         "/DNOGDI",
     ]
     if is_external: