Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(407)

Unified Diff: build/common.gypi

Issue 12095046: gyp: do not force stack protector on Chrome OS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix up comment Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 01904f5478645cb3b9a1a1e6824584316948b86f..50983b81d92758f27be5f13be8ade63e4fb976da 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2372,18 +2372,25 @@
'conditions': [
['os_posix==1', {
'target_defaults': {
- 'cflags': [
- # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc
- # supports it.
- '-fstack-protector',
- '--param=ssp-buffer-size=4',
- ],
'ldflags': [
'-Wl,-z,now',
'-Wl,-z,relro',
],
},
}],
+ ['os_posix==1 and chromeos==0', {
+ # Chrome OS enables -fstack-protector-strong via its build wrapper,
+ # and we want to avoid overriding this, so stack-protector is only
+ # enabled when not building on Chrome OS.
+ # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc
+ # supports it.
+ 'target_defaults': {
+ 'cflags': [
+ '-fstack-protector',
+ '--param=ssp-buffer-size=4',
+ ],
+ },
+ }],
['os_posix==1 and OS!="mac" and OS!="ios"', {
'target_defaults': {
# Enable -Werror by default, but put it in a variable so it can
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698