From 1beb3191c20ea315186dc761540d25c4939f1892 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Wed, 12 Aug 2020 12:53:19 -0700 Subject: Export of internal Abseil changes -- 240f86077dabaa58210e6b1a35cc442902409bf5 by Gennadiy Rozental : Fix the link to the Allocator concept description. PiperOrigin-RevId: 326292363 -- d023337da5c7c23ec5f316c4e03efc4d8404ad63 by Gennadiy Rozental : Add -DNOMINMAX to gcc/clang build command line in case they are used to build Abseil on Windows. Fixes #761 PiperOrigin-RevId: 326255039 GitOrigin-RevId: 240f86077dabaa58210e6b1a35cc442902409bf5 Change-Id: If8a40a9b2be9c0c1e652347e2f22e2fff6bbeaa1 --- absl/copts/copts.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'absl/copts/copts.py') diff --git a/absl/copts/copts.py b/absl/copts/copts.py index 7c3edb6..a3437c1 100644 --- a/absl/copts/copts.py +++ b/absl/copts/copts.py @@ -141,6 +141,8 @@ COPT_VARS = { # Google style does not use unsigned integers, though STL containers # have unsigned types. "-Wno-sign-compare", + # Don't define min and max macros (Build on Windows using gcc) + "-DNOMINMAX", ], "ABSL_GCC_TEST_FLAGS": [ "-Wno-conversion-null", @@ -152,7 +154,10 @@ COPT_VARS = { "-Wno-unused-private-field", ], "ABSL_LLVM_FLAGS": - LLVM_BIG_WARNING_FLAGS + LLVM_DISABLE_WARNINGS_FLAGS, + LLVM_BIG_WARNING_FLAGS + LLVM_DISABLE_WARNINGS_FLAGS + [ + # Don't define min and max macros (Build on Windows using clang) + "-DNOMINMAX", + ], "ABSL_LLVM_TEST_FLAGS": LLVM_TEST_DISABLE_WARNINGS_FLAGS, "ABSL_CLANG_CL_FLAGS": -- cgit v1.2.3