From fdec984be0bcefa1b85ae5acc843f3ae4a1fa367 Mon Sep 17 00:00:00 2001 From: Ivan Folgueira Bande Date: Mon, 22 Dec 2025 18:23:52 +0100 Subject: [PATCH] proper pass ARCH in Makefile when building for Android --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 40cacc7..6f096ca 100644 --- a/Makefile +++ b/Makefile @@ -115,7 +115,7 @@ build-libsds-for-android-arch: NIM_PARAMS := $(NIM_PARAMS) --passC="-I$(ANDROID_ build-libsds-for-android-arch: NIM_PARAMS := $(NIM_PARAMS) --passL="-L$(ANDROID_TOOLCHAIN_DIR)/sysroot/usr/lib/$(ARCH_DIRNAME)/$(ANDROID_TARGET)" build-libsds-for-android-arch: CC=$(ANDROID_TOOLCHAIN_DIR)/bin/$(ANDROID_ARCH)$(ANDROID_TARGET)-clang \ - CPU=$(CPU) ABIDIR=$(ABIDIR) \ + ARCH=$(ARCH) ABIDIR=$(ABIDIR) \ ARCH_DIRNAME=$(ARCH_DIRNAME) \ ANDROID_ARCH=$(ANDROID_ARCH) \ ANDROID_TOOLCHAIN_DIR=$(ANDROID_TOOLCHAIN_DIR) \ @@ -123,37 +123,37 @@ build-libsds-for-android-arch: nim libsdsAndroid $(NIM_PARAMS) sds.nims libsds-android-arm64: ANDROID_ARCH=aarch64-linux-android -libsds-android-arm64: CPU=arm64 +libsds-android-arm64: ARCH=arm64 libsds-android-arm64: ABIDIR=arm64-v8a libsds-android-arm64: ARCH_DIRNAME=aarch64-linux-android libsds-android-arm64: | libsds-android-precheck build deps $(MAKE) build-libsds-for-android-arch ANDROID_ARCH=$(ANDROID_ARCH) \ - CPU=$(CPU) ABIDIR=$(ABIDIR) ARCH_DIRNAME=$(ARCH_DIRNAME) + ARCH=$(ARCH) ABIDIR=$(ABIDIR) ARCH_DIRNAME=$(ARCH_DIRNAME) libsds-android-amd64: ANDROID_ARCH=x86_64-linux-android -libsds-android-amd64: CPU=amd64 +libsds-android-amd64: ARCH=amd64 libsds-android-amd64: ABIDIR=x86_64 libsds-android-amd64: ARCH_DIRNAME=x86_64-linux-android libsds-android-amd64: | libsds-android-precheck build deps $(MAKE) build-libsds-for-android-arch ANDROID_ARCH=$(ANDROID_ARCH) \ - CPU=$(CPU) ABIDIR=$(ABIDIR) ARCH_DIRNAME=$(ARCH_DIRNAME) + ARCH=$(ARCH) ABIDIR=$(ABIDIR) ARCH_DIRNAME=$(ARCH_DIRNAME) libsds-android-x86: ANDROID_ARCH=i686-linux-android -libsds-android-x86: CPU=i386 +libsds-android-x86: ARCH=i386 libsds-android-x86: ABIDIR=x86 libsds-android-x86: ARCH_DIRNAME=i686-linux-android libsds-android-x86: | libsds-android-precheck build deps $(MAKE) build-libsds-for-android-arch ANDROID_ARCH=$(ANDROID_ARCH) \ - CPU=$(CPU) ABIDIR=$(ABIDIR) ARCH_DIRNAME=$(ARCH_DIRNAME) + ARCH=$(ARCH) ABIDIR=$(ABIDIR) ARCH_DIRNAME=$(ARCH_DIRNAME) libsds-android-arm: ANDROID_ARCH=armv7a-linux-androideabi -libsds-android-arm: CPU=arm +libsds-android-arm: ARCH=arm libsds-android-arm: ABIDIR=armeabi-v7a libsds-android-arm: ARCH_DIRNAME=arm-linux-androideabi libsds-android-arm: | libsds-android-precheck build deps # cross-rs target architecture name does not match the one used in android $(MAKE) build-libsds-for-android-arch ANDROID_ARCH=$(ANDROID_ARCH) \ - CPU=$(CPU) ABIDIR=$(ABIDIR) ARCH_DIRNAME=$(ARCH_DIRNAME) \ + ARCH=$(ARCH) ABIDIR=$(ABIDIR) ARCH_DIRNAME=$(ARCH_DIRNAME) \ libsds-android: ifeq ($(ARCH),arm64)