diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-04 13:55:09 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-04 13:55:09 +0000 |
| commit | 0562ead88e7cb03261577d0fdf01c33e9c166bfd (patch) | |
| tree | 37eeb85270d478194442437efd997356e9254927 /chrome_frame/chrome_frame.gyp | |
| parent | 0d8efc0a130babb9fcaac2ed93e01b5a0b9f2917 (diff) | |
| download | chromium_src-0562ead88e7cb03261577d0fdf01c33e9c166bfd.zip chromium_src-0562ead88e7cb03261577d0fdf01c33e9c166bfd.tar.gz chromium_src-0562ead88e7cb03261577d0fdf01c33e9c166bfd.tar.bz2 | |
Allow building chrome_frame on a system without python in path.
BUG=none
TEST=build on a Windows machine without python.exe in path
Review URL: http://codereview.chromium.org/242058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 9ef850b..e6a472e 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -132,6 +132,17 @@ '<(xul_sdk_dir)/include/zipwriter', '<(xul_sdk_dir)/include/zlib', '<(xul_sdk_dir)/sdk/include', + ],
+ 'conditions': [
+ ['OS=="win"', {
+ 'python': [
+ '<(DEPTH)\\third_party\\python_24\\setup_env.bat && python'
+ ],
+ }, { # OS != win
+ 'python': [
+ 'python'
+ ],
+ }], ], }, 'includes': [ @@ -203,7 +214,7 @@ '<(PRODUCT_DIR)/lib/base_noicu.lib', ], 'action': [ - 'python', + '<@(python)', 'combine_libs.py', '-o <(_outputs)', '-r (icu_|_icu.obj)', |