Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve AR
Browse files Browse the repository at this point in the history
star-hengxing committed Jan 1, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent c2ff310 commit d2ca1a3
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions packages/f/ffmpeg/xmake.lua
Original file line number Diff line number Diff line change
@@ -221,15 +221,15 @@ package("ffmpeg")
envs.PATH = os.getenv("PATH") -- we need to reserve PATH on msys2
envs = os.joinenvs(envs, msvc:runenvs())
end
if package:config("shared") and package:is_cross() then
-- The makedef script always assumes that the AR environment variable is gnu ar
-- @see https://github.com/microsoft/vcpkg/issues/42365#issuecomment-2567009409
envs.AR = nil
end
-- add gas-preprocessor to PATH
if package:is_arch("arm", "arm64") then
envs.PATH = path.join(os.programdir(), "scripts") .. path.envsep() .. envs.PATH
end
if package:is_cross() then
-- The makedef script always assumes that the AR environment variable is gnu ar
-- @see https://github.com/microsoft/vcpkg/issues/42365
envs.AR = nil
end
autoconf.install(package, configs, {envs = envs})
else
import("core.base.option")

0 comments on commit d2ca1a3

Please sign in to comment.