Skip to content

Commit e503566

Browse files
committed
Merge pull request godotengine#94993 from akien-mga/scons-4.8.0-load-ninja-earlier
SCons: Load optional ninja tool before setting its options
2 parents 7e1b74b + d2064fe commit e503566

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

SConstruct

+1-2
Original file line numberDiff line numberDiff line change
@@ -1025,14 +1025,13 @@ if env["ninja"]:
10251025
Exit(255)
10261026

10271027
SetOption("experimental", "ninja")
1028+
env.Tool("ninja")
10281029

10291030
# By setting this we allow the user to run ninja by themselves with all
10301031
# the flags they need, as apparently automatically running from scons
10311032
# is way slower.
10321033
SetOption("disable_execute_ninja", True)
10331034

1034-
env.Tool("ninja")
1035-
10361035
# Threads
10371036
if env["threads"]:
10381037
env.Append(CPPDEFINES=["THREADS_ENABLED"])

0 commit comments

Comments
 (0)