Merge pull request #3447 from martin-frbg/issue3446

Fix potentially wrong HOSTARCH definition in cross-compilation
This commit is contained in:
Martin Kroeker 2021-11-11 09:29:36 +01:00 committed by GitHub
commit 5b7a3c0e1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions

View File

@ -9,11 +9,10 @@ ifndef TOPDIR
TOPDIR = . TOPDIR = .
endif endif
# If ARCH is not set, we use the host system's architecture for getarch compile options. # we need to use the host system's architecture for getarch compile options even especially when cross-compiling
ifndef ARCH
HOSTARCH := $(shell uname -m) HOSTARCH := $(shell uname -m)
else ifeq ($(HOSTARCH), amd64)
HOSTARCH = $(ARCH) HOSTARCH=x86_64
endif endif
HAVE_GAS := $(shell as -v < /dev/null 2>&1 | grep GNU 2>&1 >/dev/null) HAVE_GAS := $(shell as -v < /dev/null 2>&1 | grep GNU 2>&1 >/dev/null)