diff options
| author | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 04:24:21 +0000 |
|---|---|---|
| committer | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 04:24:21 +0000 |
| commit | 718d232dfd9344414e736fbd13497ad3305ac0c4 (patch) | |
| tree | 8010935a93d5026900642ec6ef292370fd3549c3 | |
| parent | 8bf5a3eff3ae66eb2f4dae5feb1ae58dd240b4f3 (diff) | |
| download | chromium_src-718d232dfd9344414e736fbd13497ad3305ac0c4.zip chromium_src-718d232dfd9344414e736fbd13497ad3305ac0c4.tar.gz chromium_src-718d232dfd9344414e736fbd13497ad3305ac0c4.tar.bz2 | |
linux: arm fixes
Review URL: http://codereview.chromium.org/549104
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37497 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | o3d/build/common_global.gypi | 5 | ||||
| -rw-r--r-- | o3d/import/archive.gyp | 15 | ||||
| -rw-r--r-- | o3d/import/import.gyp | 7 | ||||
| -rw-r--r-- | o3d/plugin/idl/idl.gyp | 13 | ||||
| -rw-r--r-- | o3d/plugin/plugin.gyp | 3 |
5 files changed, 6 insertions, 37 deletions
diff --git a/o3d/build/common_global.gypi b/o3d/build/common_global.gypi index b4d4e8fb..6e62f1a 100644 --- a/o3d/build/common_global.gypi +++ b/o3d/build/common_global.gypi @@ -31,6 +31,11 @@ '-m64', ], }], + [ 'OS == "linux" and target_arch=="arm"', { + 'cflags': [ + '-fPIC', + ], + }], [ 'OS == "mac"', { 'xcode_settings': { 'MACOSX_DEPLOYMENT_TARGET': '10.5', diff --git a/o3d/import/archive.gyp b/o3d/import/archive.gyp index ec724a4..525f6c9a 100644 --- a/o3d/import/archive.gyp +++ b/o3d/import/archive.gyp @@ -16,21 +16,6 @@ '../../<(cgdir)/include', '../../<(gtestdir)', ], - 'conditions': [ - ['OS=="linux"', - { - 'include_dirs': [ - '/usr/include/cairo', - '/usr/include/glib-2.0', - '/usr/include/gtk-2.0', - '/usr/include/pango-1.0', - '/usr/lib/glib-2.0/include', - '/usr/lib/gtk-2.0/include', - '/usr/include/atk-1.0', - ], - }, - ], - ], }, 'targets': [ { diff --git a/o3d/import/import.gyp b/o3d/import/import.gyp index d07fd1c..9c43b72 100644 --- a/o3d/import/import.gyp +++ b/o3d/import/import.gyp @@ -83,13 +83,6 @@ ], 'include_dirs': [ '../../third_party/glew/files/include', - '/usr/include/cairo', - '/usr/include/glib-2.0', - '/usr/include/gtk-2.0', - '/usr/include/pango-1.0', - '/usr/lib/glib-2.0/include', - '/usr/lib/gtk-2.0/include', - '/usr/include/atk-1.0', ], }, ], diff --git a/o3d/plugin/idl/idl.gyp b/o3d/plugin/idl/idl.gyp index 6042ea8..a6eb6c3 100644 --- a/o3d/plugin/idl/idl.gyp +++ b/o3d/plugin/idl/idl.gyp @@ -43,19 +43,6 @@ ], }, ], - ['OS=="linux"', - { - 'include_dirs': [ - '/usr/include/cairo', - '/usr/include/glib-2.0', - '/usr/include/gtk-2.0', - '/usr/include/pango-1.0', - '/usr/lib/glib-2.0/include', - '/usr/lib/gtk-2.0/include', - '/usr/include/atk-1.0', - ], - }, - ], ], }, 'targets': [ diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index 48b9498..9fca8f9 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -209,8 +209,7 @@ 'linux/main_linux.cc', ], 'ldflags': [ - '-z', - 'nodelete', + '-Wl,-znodelete', '-Wl,--gc-sections', ], 'link_settings': { |