Skip to content

Commit 9a10421

Browse files
danbevtargos
authored andcommitted
build: use arm64 as DESTCPU for aarch64
On a aarch64 system I can run the complete build with tests without specifying the Makefile variable DESTCPU. But when running the tar-headers target DESTCPU is passed to configure: $(PYTHON) ./configure \ --prefix=/ \ --dest-cpu=$(DESTCPU) \ ... The value of DESTCPU in this case will be aarch64 which will cause configure to fail: configure: error: option --dest-cpu: invalid choice: 'aarch64' (choose from 'arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc', 'ppc64', 'x32', 'x64', 'x86', 'x86_64', 's390', 's390x') In the configure script there is a matching of __aarch64__ to arm64: $ python -c 'from configure import host_arch_cc; print host_arch_cc()' arm64 In our case it would be nice to have consitent behaviour for both of these cases on aarch64. This commit changes DESTCPU to arm64 to be consistent with the configure script. DESTCPU is used in $(TARBALL)-headers and in $(BINARYTAR) but I'm not sure about the implications of making the change purposed and hope others might chime in and provide some guidance. PR-URL: #22548 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>
1 parent 1edd47e commit 9a10421

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ ifeq ($(findstring arm,$(UNAME_M)),arm)
731731
DESTCPU ?= arm
732732
else
733733
ifeq ($(findstring aarch64,$(UNAME_M)),aarch64)
734-
DESTCPU ?= aarch64
734+
DESTCPU ?= arm64
735735
else
736736
ifeq ($(findstring powerpc,$(shell uname -p)),powerpc)
737737
DESTCPU ?= ppc64
@@ -751,7 +751,7 @@ else
751751
ifeq ($(DESTCPU),arm)
752752
ARCH=arm
753753
else
754-
ifeq ($(DESTCPU),aarch64)
754+
ifeq ($(DESTCPU),arm64)
755755
ARCH=arm64
756756
else
757757
ifeq ($(DESTCPU),ppc64)

0 commit comments

Comments
 (0)