Skip to content

Commit 4d45502

Browse files
committed
Makefile: targeted workaround for s390x builds on c10s
Signed-off-by: John Eckersberg <[email protected]>
1 parent 24f2dd0 commit 4d45502

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

Makefile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,18 @@ TAR_REPRODUCIBLE = tar --mtime="@${SOURCE_DATE_EPOCH}" --sort=name --owner=0 --g
2727
# (Note we should also make installation of the units conditional on the rhsm feature)
2828
CARGO_FEATURES ?= $(shell . /usr/lib/os-release; if echo "$$ID_LIKE" |grep -qF rhel; then echo rhsm; fi)
2929

30+
# https://issues.redhat.com/browse/RHEL-116881
31+
ARCH ?= $(shell uname -m)
32+
ID ?= $(shell [ -f /etc/os-release ] && . /etc/os-release && echo $$ID)
33+
VERSION_ID ?= $(shell [ -f /etc/os-release ] && . /etc/os-release && echo $$VERSION_ID)
34+
ifeq ($(ARCH)-$(ID)-$(VERSION_ID),s390x-centos-10)
35+
CARGO_BUILD_ENV ?= MALLOC_MMAP_MAX_=0
36+
endif
37+
3038
all: bin manpages
3139

3240
bin:
33-
cargo build --release --features "$(CARGO_FEATURES)"
41+
$(CARGO_BUILD_ENV) cargo build --release --features "$(CARGO_FEATURES)"
3442

3543
.PHONY: manpages
3644
manpages:

0 commit comments

Comments
 (0)