diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 21:36:08 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 21:36:08 +0000 |
| commit | 5e7afe7f532548c108c321c45c910176f5398fe6 (patch) | |
| tree | 2468a90f9edc624572d4abbbc6ece7f980e8078b /third_party/mesa | |
| parent | 2ad35bc5eda1d4cb0d7e08b5ed486b0deca43a69 (diff) | |
| download | chromium_src-5e7afe7f532548c108c321c45c910176f5398fe6.zip chromium_src-5e7afe7f532548c108c321c45c910176f5398fe6.tar.gz chromium_src-5e7afe7f532548c108c321c45c910176f5398fe6.tar.bz2 | |
Build OSMesa as a loadable_module so chrome does not link against it.
Build Mesa with -fPIC flag on linux so it can be linked into a shared library.
TEST=try
BUG=none
Review URL: http://codereview.chromium.org/2975016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52542 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/mesa')
| -rw-r--r-- | third_party/mesa/mesa.gyp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp index 161a1b0..277add5 100644 --- a/third_party/mesa/mesa.gyp +++ b/third_party/mesa/mesa.gyp @@ -5,6 +5,15 @@ { 'variables': { }, + 'target_defaults': { + 'conditions': [ + ['OS=="linux"', { + 'cflags': [ + '-fPIC', + ], + }], + ], + }, 'targets': [ { 'target_name': 'mesa', @@ -424,7 +433,8 @@ # replace it with a slow software renderer. { 'target_name': 'osmesa', - 'type': 'shared_library', + 'type': 'loadable_module', + 'mac_bundle': 0, 'dependencies': [ 'mesa', ], |