diff options
Diffstat (limited to 'absl/copts')
| -rw-r--r-- | absl/copts/GENERATED_AbseilCopts.cmake | 2 | ||||
| -rw-r--r-- | absl/copts/GENERATED_copts.bzl | 2 | ||||
| -rw-r--r-- | absl/copts/copts.py | 7 |
3 files changed, 10 insertions, 1 deletions
diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake index 935eb6db..97bd283e 100644 --- a/absl/copts/GENERATED_AbseilCopts.cmake +++ b/absl/copts/GENERATED_AbseilCopts.cmake @@ -89,6 +89,7 @@ list(APPEND ABSL_GCC_FLAGS "-Wwrite-strings" "-Wno-missing-field-initializers" "-Wno-sign-compare" + "-DNOMINMAX" ) list(APPEND ABSL_GCC_TEST_FLAGS @@ -146,6 +147,7 @@ list(APPEND ABSL_LLVM_FLAGS "-Wobjc-literal-conversion" "-Wno-sign-conversion" "-Wstring-conversion" + "-DNOMINMAX" ) list(APPEND ABSL_LLVM_TEST_FLAGS diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl index dad5b285..bcdd61ef 100644 --- a/absl/copts/GENERATED_copts.bzl +++ b/absl/copts/GENERATED_copts.bzl @@ -90,6 +90,7 @@ ABSL_GCC_FLAGS = [ "-Wwrite-strings", "-Wno-missing-field-initializers", "-Wno-sign-compare", + "-DNOMINMAX", ] ABSL_GCC_TEST_FLAGS = [ @@ -147,6 +148,7 @@ ABSL_LLVM_FLAGS = [ "-Wobjc-literal-conversion", "-Wno-sign-conversion", "-Wstring-conversion", + "-DNOMINMAX", ] ABSL_LLVM_TEST_FLAGS = [ diff --git a/absl/copts/copts.py b/absl/copts/copts.py index 7c3edb64..a3437c1b 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": |