Commit af5a7274 authored by Jarred Nicholls's avatar Jarred Nicholls
Browse files

Look for the NINJA_PATH env var and prefer that over the bootstrapped ninja


The snapshot ninja may cause issues in some environments, where a different
ninja version may work. If the user has NINJA_PATH set in their environment,
prefer that over bootstrapping our own.

Change-Id: I4c6d2f479aeae1f5137705ed2deb995b59ea287a
Reviewed-by: default avatarAndras Becsi <andras.becsi@digia.com>
parent dca4a72f
No related merge requests found
Showing with 9 additions and 4 deletions
...@@ -105,10 +105,15 @@ defineReplace(which) { ...@@ -105,10 +105,15 @@ defineReplace(which) {
} }
defineReplace(findOrBuildNinja) { defineReplace(findOrBuildNinja) {
out = $$absolute_path("$${getChromiumSrcDir()}/../ninja/ninja", "$$QTWEBENGINE_ROOT") # If NINJA_PATH env var is set, prefer that.
win32: out = $$system_path($${out}.exe) # Fallback to locating our own bootstrapped ninja.
out = $(NINJA_PATH)
!exists($$out) {
out = $$absolute_path("$${getChromiumSrcDir()}/../ninja/ninja", "$$QTWEBENGINE_ROOT")
win32: out = $$system_path($${out}.exe)
# If we did not find ninja, then we bootstrap it. # If we did not find ninja, then we bootstrap it.
!exists($$out): system("python $$dirname(out)/bootstrap.py") !exists($$out): system("python $$dirname(out)/bootstrap.py")
}
return($$out) return($$out)
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment