From 643ca7872b450ea4efacab6188849e5aac2ba161 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 15 Dec 2009 10:12:09 +0000 Subject: Merge webkit.org at r51976 : Initial merge by git. Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43 --- WebKit/chromium/gyp_webkit | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'WebKit/chromium/gyp_webkit') diff --git a/WebKit/chromium/gyp_webkit b/WebKit/chromium/gyp_webkit index 810af54..ef18239 100644 --- a/WebKit/chromium/gyp_webkit +++ b/WebKit/chromium/gyp_webkit @@ -32,6 +32,7 @@ import glob import os +import platform import shlex import sys @@ -76,6 +77,10 @@ if __name__ == '__main__': # Add includes. args.extend(['-I' + i for i in additional_include_files(args)]) + # On linux, we want gyp to output a makefile (default is scons). + if (platform.system() == 'Linux'): + args.extend(['-fmake']) + # Other command args: args.extend([ # gyp variable defines. @@ -87,7 +92,7 @@ if __name__ == '__main__': '--depth=./', # gyp file to execute. - 'webkit.gyp']) + 'WebKit.gyp']) print 'Updating webkit projects from gyp files...' sys.stdout.flush() -- cgit v1.1