diff options
author | Abseil Team <absl-team@google.com> | 2019-04-05T16·05-0700 |
---|---|---|
committer | Jon Cohen <cohenjon@google.com> | 2019-04-05T16·06-0400 |
commit | 6cc6ac44e065b9e8975fadfd6ccb99cbcf89aac4 (patch) | |
tree | 9ed2f64fd1802dde559528d259c1b9caaead4e28 /absl/copts | |
parent | 666fc1266bccfd8e6eaaa084e7b42580bb8eb199 (diff) |
Export of internal Abseil changes.
-- 4a7dc9bd72a50f493671ea3ae2a571462cb70fc4 by Jon Cohen <cohenjon@google.com>: Use -ignore instead of /ignore. CMake was interpreting /ignore as a path and changing it it \ignore in windows builds, expecting it to be some sort of file. Close #293 PiperOrigin-RevId: 242134552 -- 8de3e403667f677859584bb321ef8fce3253af18 by CJ Johnson <johnsoncj@google.com>: In InlinedVector: Migrates `Rep` to `Data` getting rid of the `Allocation` class. PiperOrigin-RevId: 242130255 GitOrigin-RevId: 4a7dc9bd72a50f493671ea3ae2a571462cb70fc4 Change-Id: Ic7ff4c572bba7a411155bf304b9cae10d68599db
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 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake index cf38ec1247cf..5543638c8b5a 100644 --- a/absl/copts/GENERATED_AbseilCopts.cmake +++ b/absl/copts/GENERATED_AbseilCopts.cmake @@ -204,7 +204,7 @@ list(APPEND ABSL_MSVC_FLAGS ) list(APPEND ABSL_MSVC_LINKOPTS - "/ignore:4221" + "-ignore:4221" ) list(APPEND ABSL_MSVC_TEST_FLAGS diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl index 52e1a949f2d3..10caa78a8036 100644 --- a/absl/copts/GENERATED_copts.bzl +++ b/absl/copts/GENERATED_copts.bzl @@ -205,7 +205,7 @@ ABSL_MSVC_FLAGS = [ ] ABSL_MSVC_LINKOPTS = [ - "/ignore:4221", + "-ignore:4221", ] ABSL_MSVC_TEST_FLAGS = [ diff --git a/absl/copts/copts.py b/absl/copts/copts.py index 880ff991bda4..cdcf61d675f3 100644 --- a/absl/copts/copts.py +++ b/absl/copts/copts.py @@ -189,6 +189,6 @@ COPT_VARS = { MSVC_STYLE_EXCEPTIONS_FLAGS, "ABSL_MSVC_LINKOPTS": [ # Object file doesn't export any previously undefined symbols - "/ignore:4221", + "-ignore:4221", ], } |