|
 |
1dfa00a |
diff -pruN gyp.orig/pylib/gyp/generator/ninja.py gyp/pylib/gyp/generator/ninja.py
|
|
|
1dfa00a |
--- gyp.orig/pylib/gyp/generator/ninja.py 2016-10-17 11:00:37.000000000 +0900
|
|
|
1dfa00a |
+++ gyp/pylib/gyp/generator/ninja.py 2016-10-17 12:42:10.226872110 +0900
|
|
|
1dfa00a |
@@ -2064,11 +2064,11 @@ def GenerateOutputForConfig(target_list,
|
|
|
1dfa00a |
# .c files. This should be handled by mspdbsrv, but rarely errors out with
|
|
|
1dfa00a |
# c1xx : fatal error C1033: cannot open program database
|
|
|
1dfa00a |
# By making the rules target separate pdb files this might be avoided.
|
|
|
1dfa00a |
- cc_command = ('ninja -t msvc -e $arch ' +
|
|
|
1dfa00a |
+ cc_command = ('ninja-build -t msvc -e $arch ' +
|
|
|
1dfa00a |
'-- '
|
|
|
1dfa00a |
'$cc /nologo /showIncludes /FC '
|
|
|
1dfa00a |
'@$out.rsp /c $in /Fo$out /Fd$pdbname_c ')
|
|
|
1dfa00a |
- cxx_command = ('ninja -t msvc -e $arch ' +
|
|
|
1dfa00a |
+ cxx_command = ('ninja-build -t msvc -e $arch ' +
|
|
|
1dfa00a |
'-- '
|
|
|
1dfa00a |
'$cxx /nologo /showIncludes /FC '
|
|
|
1dfa00a |
'@$out.rsp /c $in /Fo$out /Fd$pdbname_cc ')
|
|
|
1dfa00a |
@@ -2436,7 +2436,7 @@ def PerformBuild(data, configurations, p
|
|
|
1dfa00a |
options = params['options']
|
|
|
1dfa00a |
for config in configurations:
|
|
|
1dfa00a |
builddir = os.path.join(options.toplevel_dir, 'out', config)
|
|
|
1dfa00a |
- arguments = ['ninja', '-C', builddir]
|
|
|
1dfa00a |
+ arguments = ['ninja-build', '-C', builddir]
|
|
|
1dfa00a |
print 'Building [%s]: %s' % (config, arguments)
|
|
|
1dfa00a |
subprocess.check_call(arguments)
|
|
|
1dfa00a |
|