Skip to content

Commit

Permalink
Merge pull request #94993 from akien-mga/scons-4.8.0-load-ninja-earlier
Browse files Browse the repository at this point in the history
SCons: Load optional ninja tool before setting its options
  • Loading branch information
akien-mga committed Jul 31, 2024
2 parents 7e1b74b + d2064fe commit e503566
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down

0 comments on commit e503566

Please sign in to comment.