diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-11-06 12:28:08 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-11-06 12:28:08 +0000 |
| commit | 693b239eae43544dd1c61903280f53ef6638e5f3 (patch) | |
| tree | 3d49c6175dd94f59148fcf490de49ac7ab1cb153 | |
| parent | d82d6bab09bcf24a719983f36ecf1e3ada0bb70e (diff) | |
| parent | a4649b7993e73d6da9cf42b1b236d0e51d60fd4e (diff) | |
| download | freetype-693b239eae43544dd1c61903280f53ef6638e5f3.tar.gz | |
Merge from Chromium at DEPS revision 232870
This commit was generated by merge_to_master.py.
Change-Id: Ifa6a9c114a7044d76624432eef5c415b9a4a8ac5
| -rw-r--r-- | ft2.target.darwin-x86.mk | 4 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 855f9ac..590bf5c 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -71,11 +71,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 \ @@ -156,11 +156,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/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 855f9ac..590bf5c 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -71,11 +71,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 \ @@ -156,11 +156,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 \ |