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

SCons: Load optional ninja tool before setting its options
This commit is contained in:
Rémi Verschelde 2024-08-01 00:06:43 +02:00
commit e5035668b1
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 1 additions and 2 deletions

View File

@ -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"])