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

Unified Diff: chrome/chrome_exe.gypi

Issue 6969045: Simplify the disable_pie logic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 9 years, 7 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 | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_exe.gypi
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 73a6c44e652a68fa54d2ec4c7dbee8e117bec100..a2f0a4991d348ee8a9380a8c896ddc0438f2b96e 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -147,6 +147,7 @@
'variables': {
'chrome_exe_target': 1,
'use_system_xdg_utils%': 0,
+ 'disable_pie%': 0,
},
'conditions': [
['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
@@ -187,7 +188,7 @@
},
],
'conditions': [
- [ 'linux_use_tcmalloc==1', {
+ ['linux_use_tcmalloc==1', {
'dependencies': [
'<(allocator_target)',
],
@@ -196,10 +197,9 @@
# TODO(rkc): Remove this once we have a fix for remote gdb
# and are able to correctly get section header offsets for
# pie executables. Currently -pie breaks remote debugging.
- [ '(disable_pie==1 and chromeos==1)', {
- 'ldflags' : ['-nopie'],
- }
- ],
+ ['disable_pie==1', {
+ 'ldflags' : ['-nopie'],
+ }],
['use_system_xdg_utils==0', {
'copies': [
{
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698