summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-01-11 17:20:37 -0500
committerGitHub <noreply@github.com>2021-01-11 17:20:37 -0500
commit56819073147bec22badd6b5e424cd981d3383398 (patch)
tree6db1728f57f4d50612ae25ccfe1cad369cac0dbd
parenta6510892635d57dfcfbacbe910155e380612b057 (diff)
parent1d8b9e944f0b9532bd750d583a70810377d9b71e (diff)
downloadpodman-56819073147bec22badd6b5e424cd981d3383398.tar.gz
podman-56819073147bec22badd6b5e424cd981d3383398.tar.bz2
podman-56819073147bec22badd6b5e424cd981d3383398.zip
Merge pull request #8939 from cevich/more_cross_builds
Cirrus: Add cross-compile test for alternative arches
-rw-r--r--.cirrus.yml2
-rw-r--r--Makefile2
-rwxr-xr-xcontrib/cirrus/runner.sh3
3 files changed, 6 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 18cb889ad..3eaa4ede8 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -311,6 +311,8 @@ alt_build_task:
ALT_NAME: 'Build Without CGO'
- env:
ALT_NAME: 'Test build RPM'
+ - env:
+ ALT_NAME: 'Alt Arch. Cross'
setup_script: *setup
main_script: *main
always: *binary_artifacts
diff --git a/Makefile b/Makefile
index c0c1e4003..085af6d80 100644
--- a/Makefile
+++ b/Makefile
@@ -225,7 +225,7 @@ bin/podman.cross.%: .gopathok
TARGET="$*"; \
GOOS="$${TARGET%%.*}" \
GOARCH="$${TARGET##*.}" \
- $(GO) build $(BUILDFLAGS) -gcflags '$(GCFLAGS)' -asmflags '$(ASMFLAGS)' -ldflags '$(LDFLAGS_PODMAN)' -tags '$(BUILDTAGS_CROSS)' -o "$@" ./cmd/podman
+ CGO_ENABLED=0 $(GO) build $(BUILDFLAGS) -gcflags '$(GCFLAGS)' -asmflags '$(ASMFLAGS)' -ldflags '$(LDFLAGS_PODMAN)' -tags '$(BUILDTAGS_CROSS)' -o "$@" ./cmd/podman
# Update nix/nixpkgs.json its latest stable commit
.PHONY: nixpkgs
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
index 7f9afd1fd..e09b2af9c 100755
--- a/contrib/cirrus/runner.sh
+++ b/contrib/cirrus/runner.sh
@@ -178,6 +178,9 @@ function _run_altbuild() {
make -f ./.copr/Makefile
rpmbuild --rebuild ./podman-*.src.rpm
;;
+ Alt*Cross)
+ make local-cross
+ ;;
*Static*)
req_env_vars CTR_FQIN
[[ "$UID" -eq 0 ]] || \