From d2064fea52975754be0142e28ad9ea002b3abe7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Wed, 31 Jul 2024 23:03:59 +0200
Subject: [PATCH] SCons: Load optional ninja tool before setting its options

SCons 4.8.0 made this stricter, as we were advised in #94805.

Fixes #94805.
---
 SConstruct | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/SConstruct b/SConstruct
index 7deafa7ecd70..a1f28b1fc607 100644
--- 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"])