diff options
| author | Michael Forney <mforney@mforney.org> | 2019-12-19 16:36:36 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2020-01-22 23:54:34 -0800 |
| commit | 8412b9b3442345b17fe6618a56ed9ed08dfb7417 (patch) | |
| tree | 3d330fe9cc77f43c9216ad9dc32613e013d66f8d /mkspecs | |
| parent | 46df03dc0f76628f569d63c08cc42f2e20062672 (diff) | |
Allow specifying ninja command to use with $NINJA
This was previously supported with $NINJA_PATH until 15a38cb0, when
the system-ninja test was added. However, since $NINJA seems to be the
more common environment variable for this purpose, use that instead.
This allows the builder to use a specific ninja version, or an
alternative implementation like samurai[0].
[0] https://github.com/michaelforney/samurai
Change-Id: Ib3206ce5032be1ccf2a98b45783e12afebb4949e
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/functions.prf | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index 512e2523b..8a624b4dc 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -57,10 +57,13 @@ defineReplace(pythonPathForSystem) { } defineReplace(ninjaPath) { - src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT") - out = $$shadowed($$absolute_path(ninja/ninja, $$src_3rd_party_dir)) - win32: out = $${out}.exe - return($$out) + isEmpty(QMAKE_NINJA) { + src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT") + out = $$shadowed($$absolute_path(ninja/ninja, $$src_3rd_party_dir)) + win32: out = $${out}.exe + QMAKE_NINJA = $$out + } + return($$QMAKE_NINJA) } defineReplace(gnPath) { |