From b9554c1f7a73b1c0f77d09a2ba0a6348734ecfc7 Mon Sep 17 00:00:00 2001 From: pcloudy Date: Mon, 10 Jul 2017 14:09:16 +0200 Subject: 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 --- tools/cpp/CROSSTOOL.tpl | 3 +++ 1 file changed, 3 insertions(+) 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. -- cgit v1.2.3