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

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: 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..05ef019ff708918866b862ba9db28ddaa0f2f3b1 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2372,16 +2372,20 @@
'conditions': [
['os_posix==1', {
'target_defaults': {
+ 'ldflags': [
+ '-Wl,-z,now',
+ '-Wl,-z,relro',
+ ],
+ },
+ }],
+ ['os_posix==1 and chromeos!=1', {
Jorge Lucangeli Obes 2013/01/29 23:45:51 chromeos==0 seems to be the style in the rest of t
keescook 2013/01/29 23:50:17 Done.
+ 'target_defaults': {
Jorge Lucangeli Obes 2013/01/29 23:45:51 Maybe add a comment clarifying that the change wor
keescook 2013/01/29 23:50:17 Done.
'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 OS!="mac" and OS!="ios"', {
« 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