From 33bcb6359613361b60565f280375edeb672514c8 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Fri, 7 Sep 2012 15:08:43 +0200 Subject: [PATCH] build: make gyp_uv understand '-f ninja' --- gyp_uv | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gyp_uv b/gyp_uv index 00da3aed..d861cbc7 100755 --- a/gyp_uv +++ b/gyp_uv @@ -58,9 +58,11 @@ if __name__ == '__main__': # There's a bug with windows which doesn't allow this feature. if sys.platform != 'win32': - args.extend(['--generator-output', output_dir]) - args.extend(['-Goutput_dir=' + output_dir]) - args.extend('-f make'.split()) + if '-f' not in args: + args.extend('-f make'.split()) + if 'ninja' not in args: + args.extend(['-Goutput_dir=' + output_dir]) + args.extend(['--generator-output', output_dir]) (major, minor), is_clang = compiler_version() args.append('-Dgcc_version=%d' % (10 * major + minor)) args.append('-Dclang=%d' % int(is_clang))