| 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': [
|
| {
|
|
|