Merge pull request #94993 from akien-mga/scons-4.8.0-load-ninja-earlier

SCons: Load optional ninja tool before setting its options
godotengine · Jul 31, 2024 · e503566 · e503566
2 parents 7e1b74b + d2064fe
commit e503566
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/SConstruct b/SConstruct
@@ -1025,14 +1025,13 @@ if env["ninja"]:
         Exit(255)
 
     SetOption("experimental", "ninja")
+    env.Tool("ninja")
 
     # By setting this we allow the user to run ninja by themselves with all
     # the flags they need, as apparently automatically running from scons
     # is way slower.
     SetOption("disable_execute_ninja", True)
 
-    env.Tool("ninja")
-
 # Threads
 if env["threads"]:
     env.Append(CPPDEFINES=["THREADS_ENABLED"])