mirror of
https://github.com/containers/podman.git
synced 2025-06-25 03:52:15 +08:00
Merge pull request #15235 from anjannath/pkg-goarch
pkginstaller: use correct GOARCH value in case of arm build
This commit is contained in:
@ -17,8 +17,12 @@ arch=$(cat "${BASEDIR}/ARCH")
|
|||||||
|
|
||||||
function build_podman() {
|
function build_podman() {
|
||||||
pushd "$1"
|
pushd "$1"
|
||||||
make GOARCH="${arch}" podman-remote HELPER_BINARIES_DIR="${HELPER_BINARIES_DIR}"
|
local goArch="${arch}"
|
||||||
make GOARCH="${arch}" podman-mac-helper
|
if [ "${goArch}" = aarch64 ]; then
|
||||||
|
goArch=arm64
|
||||||
|
fi
|
||||||
|
make GOARCH="${goArch}" podman-remote HELPER_BINARIES_DIR="${HELPER_BINARIES_DIR}"
|
||||||
|
make GOARCH="${goArch}" podman-mac-helper
|
||||||
cp bin/darwin/podman "contrib/pkginstaller/out/packaging/${binDir}/podman"
|
cp bin/darwin/podman "contrib/pkginstaller/out/packaging/${binDir}/podman"
|
||||||
cp bin/darwin/podman-mac-helper "contrib/pkginstaller/out/packaging/${binDir}/podman-mac-helper"
|
cp bin/darwin/podman-mac-helper "contrib/pkginstaller/out/packaging/${binDir}/podman-mac-helper"
|
||||||
popd
|
popd
|
||||||
|
Reference in New Issue
Block a user