diff options
author | Torne (Richard Coles) <torne@google.com> | 2013-11-06 12:27:47 +0000 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2013-11-06 12:27:47 +0000 |
commit | 0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 (patch) | |
tree | 08e3fb2fdca3674ceb4d6cf527cb65e755cd993e /testing | |
parent | 0bdaf95291fc46702f274f40e8e5081e9ef23011 (diff) | |
download | chromium_org-0f1bc08d4cfcc34181b0b5cbf065c40f687bf740.tar.gz |
Merge from Chromium at DEPS revision 232870
This commit was generated by merge_to_master.py.
Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
Diffstat (limited to 'testing')
-rw-r--r-- | testing/gtest_prod.target.darwin-x86.mk | 4 | ||||
-rw-r--r-- | testing/gtest_prod.target.linux-x86.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/testing/gtest_prod.target.darwin-x86.mk b/testing/gtest_prod.target.darwin-x86.mk index cf4798e81a..232fd4788d 100644 --- a/testing/gtest_prod.target.darwin-x86.mk +++ b/testing/gtest_prod.target.darwin-x86.mk @@ -52,11 +52,11 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -fno-stack-protector \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ -Wno-sequence-point \ - -fno-stack-protector \ -Os \ -g \ -fomit-frame-pointer \ @@ -133,11 +133,11 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -fno-stack-protector \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ -Wno-sequence-point \ - -fno-stack-protector \ -Os \ -fno-ident \ -fdata-sections \ diff --git a/testing/gtest_prod.target.linux-x86.mk b/testing/gtest_prod.target.linux-x86.mk index cf4798e81a..232fd4788d 100644 --- a/testing/gtest_prod.target.linux-x86.mk +++ b/testing/gtest_prod.target.linux-x86.mk @@ -52,11 +52,11 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -fno-stack-protector \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ -Wno-sequence-point \ - -fno-stack-protector \ -Os \ -g \ -fomit-frame-pointer \ @@ -133,11 +133,11 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -fno-stack-protector \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ -Wno-sequence-point \ - -fno-stack-protector \ -Os \ -fno-ident \ -fdata-sections \ |