janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

platform.mk: Fix undefined SYSTEM_LIBDIR variable

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-17 15:28:24 +00:00
commit aa87adad04
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
make/platform.mk
View file

@ -109,6 +109,19 @@ ifeq ($(TARGET_TUPLE),)
$(error TARGET_TUPLE is empty) $(error TARGET_TUPLE is empty)
endif 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 # - support legacy jw-build target variables
ifneq ($(findstring $(TARGET_ABI),mingw mingw32 mingw64),) ifneq ($(findstring $(TARGET_ABI),mingw mingw32 mingw64),)
TARGET ?= mingw TARGET ?= mingw
@ -131,21 +144,15 @@ ifndef ARCH
# TODO unreached code, test and fix this # TODO unreached code, test and fix this
ifeq ($(shell uname -m),armv7l) ifeq ($(shell uname -m),armv7l)
ARCH = armv7hl ARCH = armv7hl
SYSTEM_LIBDIR_NAME = lib
else ifeq ($(shell uname -m),armv6l) else ifeq ($(shell uname -m),armv6l)
ARCH = armv6hl ARCH = armv6hl
SYSTEM_LIBDIR_NAME = lib
else ifeq ($(shell uname -m),aarch64) else ifeq ($(shell uname -m),aarch64)
ARCH = aarch64 ARCH = aarch64
SYSTEM_LIBDIR_NAME = lib
else ifeq ($(shell uname -m),x86_64) else ifeq ($(shell uname -m),x86_64)
ARCH = x86_64 ARCH = x86_64
SYSTEM_LIBDIR_NAME = lib64
else else
ARCH = $(ARCH_32) ARCH = $(ARCH_32)
SYSTEM_LIBDIR_NAME = lib
endif endif
SYSTEM_LIBDIR = /usr/$(SYSTEM_LIBDIR_NAME)
endif endif
ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET)) ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET))