diff options
| author | Ben Murdoch <benm@google.com> | 2010-06-15 19:36:43 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-06-16 14:52:28 +0100 |
| commit | 545e470e52f0ac6a3a072bf559c796b42c6066b6 (patch) | |
| tree | c0c14763654d84d37577dde512c3d3b4699a9e86 /WebKit/chromium/gyp_webkit | |
| parent | 719298a66237d38ea5c05f1547123ad8aacbc237 (diff) | |
| download | external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.zip external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.tar.gz external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.tar.bz2 | |
Merge webkit.org at r61121: Initial merge by git.
Change-Id: Icd6db395c62285be384d137164d95d7466c98760
Diffstat (limited to 'WebKit/chromium/gyp_webkit')
| -rwxr-xr-x | WebKit/chromium/gyp_webkit | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/WebKit/chromium/gyp_webkit b/WebKit/chromium/gyp_webkit index 1ca6133..b7d2308 100755 --- a/WebKit/chromium/gyp_webkit +++ b/WebKit/chromium/gyp_webkit @@ -78,7 +78,11 @@ if __name__ == '__main__': # On linux, we want gyp to output a makefile (default is scons). if sys.platform == 'linux2': - args.extend(['-fmake']) + args.extend(['-fmake', + '--suffix=.chromium', + '--toplevel-dir=../..', + # auto_regeneration doesn't work with toplevel-dir + '-Gauto_regeneration=0']) # Other command args: args.extend([ @@ -90,7 +94,7 @@ if __name__ == '__main__': # gyp hack: otherwise gyp assumes its in chromium's src/ dir. '--depth=./', - # gyp files to execute. + # gyp file to execute. 'WebKit.gyp']) print 'Updating webkit projects from gyp files...' |