From: Andrew Jones Date: Wed, 24 Jan 2024 08:18:17 +0100 Subject: [kvm-unit-tests PATCH 01/24] configure: Add ARCH_LIBDIR In-Reply-To: <20240124071815.6898-26-andrew.jones@linux.dev> References: <20240124071815.6898-26-andrew.jones@linux.dev> Message-ID: <20240124071815.6898-27-andrew.jones@linux.dev> List-Id: To: kvm-riscv@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Prepare for an architecture which will share the same lib/$ARCH directory, but be configured with different arch names for different bit widths, i.e. riscv32 -> lib/riscv and riscv64 -> lib/riscv. Signed-off-by: Andrew Jones --- Makefile | 2 +- configure | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 602910dda11b..4f35fffc685b 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ include config.mak VPATH = $(SRCDIR) libdirs-get = $(shell [ -d "lib/$(1)" ] && echo "lib/$(1) lib/$(1)/asm") -ARCH_LIBDIRS := $(call libdirs-get,$(ARCH)) $(call libdirs-get,$(TEST_DIR)) +ARCH_LIBDIRS := $(call libdirs-get,$(ARCH_LIBDIR)) $(call libdirs-get,$(TEST_DIR)) OBJDIRS := $(ARCH_LIBDIRS) DESTDIR := $(PREFIX)/share/kvm-unit-tests/ diff --git a/configure b/configure index 6ee9b27a6af2..ada6512702a1 100755 --- a/configure +++ b/configure @@ -198,6 +198,7 @@ fi arch_name=$arch [ "$arch" = "aarch64" ] && arch="arm64" [ "$arch_name" = "arm64" ] && arch_name="aarch64" +arch_libdir=$arch if [ -z "$target" ]; then target="qemu" @@ -391,6 +392,7 @@ PREFIX=$prefix HOST=$host ARCH=$arch ARCH_NAME=$arch_name +ARCH_LIBDIR=$arch_libdir PROCESSOR=$processor CC=$cross_prefix$cc CFLAGS=$cflags -- 2.43.0