| Index: chrome/nacl.gypi
|
| diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi
|
| index 337d13ef08583a1f92abc1c8bab65b789da3ff0c..f107829113a1ef3ec8f3088df51d9fe08fd28037 100644
|
| --- a/chrome/nacl.gypi
|
| +++ b/chrome/nacl.gypi
|
| @@ -162,6 +162,13 @@
|
| 'nacl/nacl_helper_linux.cc',
|
| ],
|
| 'conditions': [
|
| + ['order_profiling != 0', {
|
| + 'target_conditions' : [
|
| + ['_toolset=="target"', {
|
| + 'cflags!': [ '-finstrument-functions' ],
|
| + }],
|
| + ],
|
| + }],
|
| ['toolkit_uses_gtk == 1', {
|
| 'dependencies': [
|
| '../build/linux/system.gyp:gtk',
|
| @@ -210,6 +217,13 @@
|
| # would be if gyp were to really build properly for the host.
|
| # TODO(bradnelson): Clean up with proper cross support.
|
| 'conditions': [
|
| + ['order_profiling != 0', {
|
| + 'target_conditions' : [
|
| + ['_toolset=="target"', {
|
| + 'cflags!': [ '-finstrument-functions' ],
|
| + }],
|
| + ],
|
| + }],
|
| ['host_arch=="x64"', {
|
| 'cflags/': [['exclude', '-m.*']],
|
| 'ldflags/': [['exclude', '-m.*']],
|
| @@ -248,6 +262,13 @@
|
| '-w',
|
| ],
|
| 'conditions': [
|
| + ['order_profiling != 0', {
|
| + 'target_conditions' : [
|
| + ['_toolset=="target"', {
|
| + 'cflags!': [ '-finstrument-functions' ],
|
| + }],
|
| + ],
|
| + }],
|
| ['clang==1', {
|
| 'cflags': [
|
| # Prevent llvm-opt from replacing my_bzero with a call
|
|
|