From 53997037181a31e778b69d359b444bc040bc1043 Mon Sep 17 00:00:00 2001
From: actboy168 <actboy168@gmail.com>
Date: Fri, 28 Jun 2024 10:02:43 +0800
Subject: [PATCH] fixes bug

---
 scripts/env/msvc.lua  |  3 +++
 scripts/workspace.lua | 12 ++++++++----
 scripts/writer.lua    |  1 -
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/scripts/env/msvc.lua b/scripts/env/msvc.lua
index 516d6db..28218db 100644
--- 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
index 4602a59..9fa3cd8 100644
--- 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
index 80a5eea..f152c83 100644
--- 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()