diff options
| -rw-r--r-- | build/common.gypi | 4 | ||||
| -rw-r--r-- | chrome/chrome_exe.gypi | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index d8c2703..112d5294 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -139,6 +139,9 @@ # Has no effect if 'clang' is not set as well. 'clang_use_chrome_plugins%': 0, + # Allow a user to link Chromium as a non-position independent executable. + 'disable_pie%': 0, + 'conditions': [ # A flag to enable or disable our compile-time dependency # on gnome-keyring. If that dependency is disabled, no gnome-keyring @@ -205,6 +208,7 @@ 'remoting%': '<(remoting)', 'p2p_apis%': '<(p2p_apis)', 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', + 'disable_pie%': '<(disable_pie)', # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 5c3c1cb..59cd001 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -193,6 +193,13 @@ ], }, ], + # 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'], + } + ], ['use_system_xdg_utils==0', { 'copies': [ { |