Просмотр исходного кода

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

SCons: Load optional ninja tool before setting its options
Rémi Verschelde 1 год назад
Родитель
Сommit
e5035668b1
1 измененных файлов с 1 добавлено и 2 удалено
  1. 1 2
      SConstruct

+ 1 - 2
SConstruct

@@ -1025,14 +1025,13 @@ if env["ninja"]:
         Exit(255)
         Exit(255)
 
 
     SetOption("experimental", "ninja")
     SetOption("experimental", "ninja")
+    env.Tool("ninja")
 
 
     # By setting this we allow the user to run ninja by themselves with all
     # By setting this we allow the user to run ninja by themselves with all
     # the flags they need, as apparently automatically running from scons
     # the flags they need, as apparently automatically running from scons
     # is way slower.
     # is way slower.
     SetOption("disable_execute_ninja", True)
     SetOption("disable_execute_ninja", True)
 
 
-    env.Tool("ninja")
-
 # Threads
 # Threads
 if env["threads"]:
 if env["threads"]:
     env.Append(CPPDEFINES=["THREADS_ENABLED"])
     env.Append(CPPDEFINES=["THREADS_ENABLED"])