diff options
| author | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 20:11:32 +0000 |
|---|---|---|
| committer | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 20:11:32 +0000 |
| commit | aa834dc6a1c117765cae43f6b6be2ab44bf8895c (patch) | |
| tree | dc6d6f8d293d4263aba74f55b12c09d89618df8e /chrome/chrome_tests.gypi | |
| parent | 2b6b1108f6460e769e5a7a02bc310ef8d8ac1fc0 (diff) | |
| download | chromium_src-aa834dc6a1c117765cae43f6b6be2ab44bf8895c.zip chromium_src-aa834dc6a1c117765cae43f6b6be2ab44bf8895c.tar.gz chromium_src-aa834dc6a1c117765cae43f6b6be2ab44bf8895c.tar.bz2 | |
Build pyauto for Linux.
Since we build a shared library (for swig), we should attempt to build pyauto only when linux_fpic==1.
Also, 'product_prefix' options with gyp (instead of platform-specifc ones) to get the right filename for the output shared lib.
BUG=32285
TEST=linux builders should remain happy
Review URL: http://codereview.chromium.org/568007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rwxr-xr-x | chrome/chrome_tests.gypi | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index e15ba52..76b02dc 100755 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1786,13 +1786,14 @@ }, ]}, # 'targets' ], # OS=="win" - ['OS=="mac"', { + ['OS=="mac" or (OS=="linux" and linux_fpic==1)', { 'targets': [ - # TODO(nirnimesh): enable for linux,win - crbug.com/32285 + # TODO(nirnimesh): enable for win - crbug.com/32285 { # Documentation: http://dev.chromium.org/developers/pyauto 'target_name': 'pyautolib', 'type': 'shared_library', + 'product_prefix': '_', 'dependencies': [ 'chrome', 'test_support_common', @@ -1822,7 +1823,6 @@ # that xcode would generate) # Change when gyp can support a platform-neutral way for this # (http://code.google.com/p/gyp/issues/detail?id=135) - 'EXECUTABLE_PREFIX': '_', 'EXECUTABLE_EXTENSION': 'so', # When generated, pyautolib_wrap.cc includes some swig support # files which, as of swig 1.3.31 that comes with 10.5 and 10.6, @@ -1838,6 +1838,11 @@ 'dependencies': [ '../build/linux/system.gyp:gtk', ], + 'link_settings': { + 'libraries': [ + '-lpython2.5', + ], + }, }], ['OS=="mac"', { 'include_dirs': [ @@ -1875,7 +1880,7 @@ ], # actions }, # target 'pyautolib' ] # targets - }], # OS=='mac' + }], # OS=='mac' or OS=='linux' ['coverage!=0', { 'targets': [ { |