janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-23 14:30:39 +01:00
Code Activity

defs.mk: Fix broken TARGET_ARCH, _VENDOR, _OS, _ABI

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-02-27 14:18:35 +00:00
commit e5133234bb
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
make/defs.mk
View file

@ -59,22 +59,26 @@ endif
OS_TUPLE ?= $(shell $(GET_OS_SH) tuple) OS_TUPLE ?= $(shell $(GET_OS_SH) tuple)
ifneq ($(TARGET_TUPLE),) ifneq ($(TARGET_TUPLE),)
TARGET_ARCH ?= $(word 1,$(TARGET_TUPLE)) TARGET_TUPLE_WORDS ?= $(subst -, ,$(TARGET_TUPLE))
TARGET_VENDOR ?= $(word 2,$(TARGET_TUPLE)) TARGET_ARCH ?= $(word 1,$(TARGET_TUPLE_WORDS))
TARGET_OS ?= $(word 3,$(TARGET_TUPLE)) TARGET_VENDOR ?= $(word 2,$(TARGET_TUPLE_WORDS))
TARGET_ABI ?= $(word 4,$(TARGET_TUPLE)) TARGET_OS ?= $(word 3,$(TARGET_TUPLE_WORDS))
TARGET_ABI ?= $(word 4,$(TARGET_TUPLE_WORDS))
TARGET_TRIPLET ?= $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI) TARGET_TRIPLET ?= $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI)
else ifneq ($(TARGET_TRIPLET),) else ifneq ($(TARGET_TRIPLET),)
TARGET_ARCH ?= $(word 1,$(TARGET_TRIPLET)) TARGET_TRIPLET_WORDS ?= $(subst -, ,$(TARGET_TRIPLET))
TARGET_ARCH ?= $(word 1,$(TARGET_TRIPLET_WORDS))
TARGET_VENDOR ?= unknown TARGET_VENDOR ?= unknown
TARGET_OS ?= $(word 2,$(TARGET_TRIPLET)) TARGET_OS ?= $(word 2,$(TARGET_TRIPLET_WORDS))
TARGET_ABI ?= $(word 3,$(TARGET_TRIPLET)) TARGET_ABI ?= $(word 3,$(TARGET_TRIPLET_WORDS))
TARGET_TUPLE ?= $(TARGET_ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(TARGET_ABI) TARGET_TUPLE ?= $(TARGET_ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(TARGET_ABI)
else else
TARGET_TUPLE ?= $(OS_TUPLE) TARGET_TUPLE ?= $(OS_TUPLE)
TARGET_VENDOR ?= $(word 2,$(TARGET_TUPLE)) TARGET_TUPLE_WORDS ?= $(subst -, ,$(TARGET_TUPLE))
TARGET_OS ?= $(word 3,$(TARGET_TUPLE)) TARGET_ARCH ?= $(word 1,$(TARGET_TUPLE_WORDS))
TARGET_ABI ?= $(word 4,$(TARGET_TUPLE)) TARGET_VENDOR ?= $(word 2,$(TARGET_TUPLE_WORDS))
TARGET_OS ?= $(word 3,$(TARGET_TUPLE_WORDS))
TARGET_ABI ?= $(word 4,$(TARGET_TUPLE_WORDS))
TARGET_TRIPLET ?= $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI) TARGET_TRIPLET ?= $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI)
endif endif
@ -1055,6 +1059,7 @@ endif
INCLUDE += $(LOCAL_INCLUDE) INCLUDE += $(LOCAL_INCLUDE)
HDRDIR_SCOPE_SUFFIX ?= $(PROJECT)
# force use of double quotes, allow header namespaces # force use of double quotes, allow header namespaces
ifeq ($(HDRDIR_SCOPE_SUFFIX),) ifeq ($(HDRDIR_SCOPE_SUFFIX),)
INCLUDE += -I. INCLUDE += -I.