diff options
| author | ruki <[email protected]> | 2020-12-24 23:23:10 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-12-24 23:23:10 +0800 |
| commit | 621e3706b229c39cfe4c94bfa9417405cde883fb (patch) | |
| tree | b6fcac4ae1120ed64af8dcaff032cda6d73393bb /xmake/core/package/package.lua | |
| parent | 70865b36f34647bda2bdd218b428bcca0cecc9da (diff) | |
fix vs_runtime values
Diffstat (limited to 'xmake/core/package/package.lua')
| -rw-r--r-- | xmake/core/package/package.lua | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index 6aaeb2f08..52c9a0c7c 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -1099,10 +1099,9 @@ function _instance:_generate_build_configs(configs) local ld = self:build_getenv("ld") local vs_runtime = self:config("vs_runtime") if vs_runtime and ld and path.basename(ld:lower()) == "link" then -- for msvc? - local vs_runtime_cxflags = "/" .. vs_runtime .. (self:debug() and "d" or "") configs.cxflags = table.wrap(configs.cxflags) - table.insert(configs.cxflags, vs_runtime_cxflags) - if vs_runtime == "MT" then + table.insert(configs.cxflags, "/" .. vs_runtime) + if vs_runtime:startswith("MT") then configs.ldflags = table.wrap(configs.ldflags) table.insert(configs.ldflags, "-nodefaultlib:msvcrt.lib") end |