fixes bug

actboy168 · Jun 28, 2024 · 5399703 · 5399703
1 parent 65597e2
commit 5399703
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/scripts/env/msvc.lua b/scripts/env/msvc.lua
@@ -2,6 +2,7 @@ local fs = require "bee.filesystem"
 local sp = require "bee.subprocess"
 local fsutil = require "fsutil"
 local globals = require "globals"
+local arguments = require "arguments"
 local log = require "log"
 
 local function Is64BitWindows()
@@ -383,4 +384,6 @@ m.vcrtpath = vcrtpath
 m.ucrtpath = ucrtpath
 m.llvmpath = llvmpath
 
+m.createEnvConfig(globals.arch, arguments.what == "rebuild")
+
 return m
diff --git a/scripts/workspace.lua b/scripts/workspace.lua
@@ -277,10 +277,14 @@ local function create(workdir, parent, attri)
         for k, v in pairs(new_attri) do
             if arguments.args[k] == nil then
                 if ATTRIBUTE[k] == AttributePaths or ATTRIBUTE[k] == AttributeStrings then
-                    local t = {}
-                    push_strings(t, parent[k])
-                    push_strings(t, v)
-                    attri[k] = t
+                    if attri[k] == nil then
+                        local t = {}
+                        push_strings(t, parent[k])
+                        push_strings(t, v)
+                        attri[k] = t
+                    else
+                        push_strings(attri[k], v)
+                    end
                 else
                     attri[k] = v
                 end

diff --git a/scripts/writer.lua b/scripts/writer.lua
@@ -782,7 +782,6 @@ function m.generate()
     if globals.compiler == "msvc" then
         if not globals.prebuilt then
             local msvc = require "env.msvc"
-            msvc.createEnvConfig(globals.arch, arguments.what == "rebuild")
             ninja:variable("msvc_deps_prefix", globals.cc == "clang-cl"
                 and "Note: including file:"
                 or msvc.getPrefix()