From aa87adad042a82a48b59c55af1c4e9fb0b15b5e7 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 17 Mar 2019 15:28:24 +0000 Subject: [PATCH] platform.mk: Fix undefined SYSTEM_LIBDIR variable Signed-off-by: Jan Lindemann --- make/platform.mk | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/make/platform.mk b/make/platform.mk index 561256e2..01aedde5 100644 --- a/make/platform.mk +++ b/make/platform.mk @@ -109,6 +109,19 @@ ifeq ($(TARGET_TUPLE),) $(error TARGET_TUPLE is empty) endif +ifeq ($(TARGET_ARCH),armv7l) + SYSTEM_LIBDIR_NAME = lib +else ifeq ($(TARGET_ARCH),armv6l) + SYSTEM_LIBDIR_NAME = lib +else ifeq ($(TARGET_ARCH),aarch64) + SYSTEM_LIBDIR_NAME = lib +else ifeq ($(TARGET_ARCH),x86_64) + SYSTEM_LIBDIR_NAME = lib64 +else + SYSTEM_LIBDIR_NAME = lib +endif +SYSTEM_LIBDIR = /usr/$(SYSTEM_LIBDIR_NAME) + # - support legacy jw-build target variables ifneq ($(findstring $(TARGET_ABI),mingw mingw32 mingw64),) TARGET ?= mingw @@ -131,21 +144,15 @@ ifndef ARCH # TODO unreached code, test and fix this ifeq ($(shell uname -m),armv7l) ARCH = armv7hl - SYSTEM_LIBDIR_NAME = lib else ifeq ($(shell uname -m),armv6l) ARCH = armv6hl - SYSTEM_LIBDIR_NAME = lib else ifeq ($(shell uname -m),aarch64) ARCH = aarch64 - SYSTEM_LIBDIR_NAME = lib else ifeq ($(shell uname -m),x86_64) ARCH = x86_64 - SYSTEM_LIBDIR_NAME = lib64 else ARCH = $(ARCH_32) - SYSTEM_LIBDIR_NAME = lib endif - SYSTEM_LIBDIR = /usr/$(SYSTEM_LIBDIR_NAME) endif ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET))