aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar pcloudy <pcloudy@google.com>2017-07-10 14:09:16 +0200
committerGravatar László Csomor <laszlocsomor@google.com>2017-07-10 14:37:45 +0200
commitb9554c1f7a73b1c0f77d09a2ba0a6348734ecfc7 (patch)
tree9f6d9017da5d4ced8a0940ca5bcea8806e8bf42f
parentf37d9aed11e7da6d69e731e8fb9b3023e09df4ac (diff)
Add /DNOMINMAX back to CROSSTOOL
/DNOMINMAX is a very common use and no one has complained about it yet, so keep it in CROSSTOOL Fixed https://github.com/bazelbuild/bazel/issues/3347 RELNOTES: None. PiperOrigin-RevId: 161381862
-rw-r--r--tools/cpp/CROSSTOOL.tpl3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl
index 9e744174b6..f3273061a6 100644
--- a/tools/cpp/CROSSTOOL.tpl
+++ b/tools/cpp/CROSSTOOL.tpl
@@ -175,6 +175,9 @@ toolchain {
compiler_flag: "/DOS_WINDOWS=OS_WINDOWS"
compiler_flag: "/DCOMPILER_MSVC"
+ # Don't define min/max macros in windows.h.
+ compiler_flag: "/DNOMINMAX"
+
# Platform defines.
compiler_flag: "/D_WIN32_WINNT=0x0600"
# Turn off warning messages.