From b7b66ad47fefa0eab4f0ed17c646527449044c08 Mon Sep 17 00:00:00 2001 From: Jérôme Leclercq Date: Fri, 3 Jan 2025 16:42:50 +0100 Subject: Fix run environment for mingw --- xmake/core/package/package.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index f5c38f337..068e95ab6 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -1073,13 +1073,13 @@ function _instance:_rawenvs() envs.PATH = table.wrap(bindirs) elseif self:is_binary() then envs.PATH = {"bin"} - elseif os.host() == "windows" and self:is_plat("windows", "mingw") and self:is_arch(os.arch()) and self:config("shared") then + elseif os.host() == "windows" and self:is_plat("windows", "mingw") and not self:is_cross() and self:config("shared") then -- bin/*.dll for windows envs.PATH = {"bin"} end -- add LD_LIBRARY_PATH to load *.so directory - if os.host() ~= "windows" and self:is_plat(os.host()) and self:is_arch(os.arch()) and self:config("shared") then + if os.host() ~= "windows" and self:is_plat(os.host()) and not self:is_cross() and self:config("shared") then envs.LD_LIBRARY_PATH = {"lib"} if os.host() == "macosx" then envs.DYLD_LIBRARY_PATH = {"lib"} -- cgit v1.3.1