From 545e470e52f0ac6a3a072bf559c796b42c6066b6 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 15 Jun 2010 19:36:43 +0100 Subject: Merge webkit.org at r61121: Initial merge by git. Change-Id: Icd6db395c62285be384d137164d95d7466c98760 --- WebKit/chromium/gyp_webkit | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'WebKit/chromium/gyp_webkit') 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...' -- cgit v1.1