From 3d000cfc013158f56c0b088c9ee99b03938ef50b Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 21 Oct 2016 18:03:36 +0200 Subject: Split ninja target into runninja and buildninja in gyp_run MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Small refactor to split the targets in makefile. Bootstrapping gn will need also ninja build. Change-Id: Id177a0189b79cf353b6bd27c4e087f4e960f56c2 Reviewed-by: Michael Brüning --- src/core/gyp_run.pro | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/core/gyp_run.pro') diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 7351b2443..7ab8cbb13 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -155,15 +155,22 @@ for (config, GYP_CONFIG): GYP_ARGS += "-D $$config" build_pass|!debug_and_release { ninja_binary = ninja - ninja.target = invoke_ninja + runninja.target = run_ninja + + !qtConfig(system-ninja) { + ninja_binary = $$shell_quote($$shell_path($$ninjaPath())) + buildninja.target = build_ninja + buildninja.commands = $$buildNinja() + QMAKE_EXTRA_TARGETS += buildninja + runninja.depends = buildninja + } - !qtConfig(system-ninja): ninja_binary = $$shell_quote($$shell_path($$buildNinja())) - ninja.commands = $$ninja_binary \$\(NINJAFLAGS\) -C $$shell_quote($$OUT_PWD/$$getConfigDir()) - QMAKE_EXTRA_TARGETS += ninja + runninja.commands = $$ninja_binary \$\(NINJAFLAGS\) -C $$shell_quote($$OUT_PWD/$$getConfigDir()) + QMAKE_EXTRA_TARGETS += runninja build_pass:build_all: default_target.target = all else: default_target.target = first - default_target.depends = ninja + default_target.depends = runninja QMAKE_EXTRA_TARGETS += default_target } else { -- cgit v1.2.3