commit e0542bcdbc74141ad88b4c3d9f2202a650e5d6e1
author Loo Rong Jie <loorongjie@gmail.com> Fri Aug 03 01:49:37 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Fri Aug 03 01:50:51 2018 -0700
tree f3cfc118d4598ec6634060b3874a2418f094422d
parent 7e41f9bd7000a8e51101d91b0c72ce7e6775068e

Disable the correct warning

I realized that I wrote the wrong warning code when I use Bazel from master branch and build something with MSVC.

For the curious:

- C4117: https://msdn.microsoft.com/en-us/library/9d2szxf8.aspx
- C4177: https://msdn.microsoft.com/en-us/library/s4becxs9.aspx

/cc @meteorcloudy

Closes #5631.

PiperOrigin-RevId: 207235606

tools/cpp/CROSSTOOL.tpl

diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl
index abeb2a2..2004282 100644
--- a/tools/cpp/CROSSTOOL.tpl
+++ b/tools/cpp/CROSSTOOL.tpl
@@ -962,7 +962,7 @@
         # Make C++ compilation deterministic. Use linkstamping instead of these
         # compiler symbols.
         # TODO: detect clang on Windows and use "-Wno-builtin-macro-redefined"
-        flag: "/wd4177" # Trying to define or undefine a predefined macro
+        flag: "/wd4117" # Trying to define or undefine a predefined macro
         flag: "-D__DATE__=\"redacted\""
         flag: "-D__TIMESTAMP__=\"redacted\""
         flag: "-D__TIME__=\"redacted\""