diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-31 23:03:59 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-31 23:03:59 +0200 |
commit | d2064fea52975754be0142e28ad9ea002b3abe7e (patch) | |
tree | 3162e0484de2dff129eba7646c3d39d0e3882363 /SConstruct | |
parent | b6dee96f68d5bd033e080f64f2c18a0dc62f469a (diff) | |
download | redot-engine-d2064fea52975754be0142e28ad9ea002b3abe7e.tar.gz |
SCons: Load optional ninja tool before setting its options
SCons 4.8.0 made this stricter, as we were advised in #94805.
Fixes #94805.
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 7deafa7ecd..a1f28b1fc6 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"]) |