diff options
| author | Steve Block <steveblock@google.com> | 2009-12-15 10:12:09 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:10 +0000 |
| commit | 643ca7872b450ea4efacab6188849e5aac2ba161 (patch) | |
| tree | 6982576c228bcd1a7efe98afed544d840751094c /WebKit/chromium/gyp_webkit | |
| parent | d026980fde6eb3b01c1fe49441174e89cd1be298 (diff) | |
| download | external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.zip external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.gz external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.bz2 | |
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
Diffstat (limited to 'WebKit/chromium/gyp_webkit')
| -rw-r--r-- | WebKit/chromium/gyp_webkit | 7 |
1 files changed, 6 insertions, 1 deletions
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() |