From 5e9dba6d15f3114a5d862c1926fc892acba0eef0 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 3 Mar 2019 19:49:54 +0000 Subject: [PATCH] platform.mk: Add support for explicit TARGET = linux Signed-off-by: Jan Lindemann --- make/platform.mk | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/make/platform.mk b/make/platform.mk index febdaa23..561256e2 100644 --- a/make/platform.mk +++ b/make/platform.mk @@ -21,6 +21,23 @@ ifndef GET_OS_SH GET_OS_SH := $(SHELL) $(MOD_SCRIPT_DIR)/get-os.sh endif +ifeq ($(HOST_TUPLE),) + HOST_TUPLE := $(shell $(GET_OS_SH) tuple) + HOST_TUPLE_WORDS := $(subst -, ,$(HOST_TUPLE)) + HOST_ARCH := $(word 1,$(HOST_TUPLE_WORDS)) + HOST_VENDOR := $(word 2,$(HOST_TUPLE_WORDS)) + HOST_OS := $(word 3,$(HOST_TUPLE_WORDS)) + HOST_ABI := $(word 4,$(HOST_TUPLE_WORDS)) + HOST_TRIPLET := $(HOST_ARCH)-$(HOST_OS)-$(HOST_ABI) +else + HOST_TUPLE_WORDS := $(subst -, ,$(HOST_TUPLE)) + HOST_ARCH := $(word 1,$(HOST_TUPLE_WORDS)) + HOST_VENDOR := $(word 2,$(HOST_TUPLE_WORDS)) + HOST_OS := $(word 3,$(HOST_TUPLE_WORDS)) + HOST_ABI := $(word 4,$(HOST_TUPLE_WORDS)) + HOST_TRIPLET := $(HOST_ARCH)-$(HOST_OS)-$(HOST_ABI) +endif + ifndef TARGET ifneq ($(subst mingw,,$(CWD)),$(CWD)) TARGET := mingw @@ -51,32 +68,17 @@ ifdef TARGET TARGET_ARCH ?= x86_64 TARGET_ABI := mingw64 TARGET_OS := w64 + else ifeq ($(TARGET),linux) endif - TARGET_ARCH ?= i686 - TARGET_VENDOR ?= unknown - TARGET_OS ?= linux - TARGET_ABI ?= gnu + # -- fall back on defaults + TARGET_ARCH ?= $(HOST_ARCH) + TARGET_VENDOR ?= $(HOST_VENDOR) + TARGET_OS ?= $(HOST_OS) + TARGET_ABI ?= $(HOST_ABI) endif TARGET_TUPLE := $(TARGET_ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(TARGET_ABI) endif -ifeq ($(HOST_TUPLE),) - HOST_TUPLE := $(shell $(GET_OS_SH) tuple) - HOST_TUPLE_WORDS := $(subst -, ,$(HOST_TUPLE)) - HOST_ARCH := $(word 1,$(HOST_TUPLE_WORDS)) - HOST_VENDOR := $(word 2,$(HOST_TUPLE_WORDS)) - HOST_OS := $(word 3,$(HOST_TUPLE_WORDS)) - HOST_ABI := $(word 4,$(HOST_TUPLE_WORDS)) - HOST_TRIPLET := $(HOST_ARCH)-$(HOST_OS)-$(HOST_ABI) -else - HOST_TUPLE_WORDS := $(subst -, ,$(HOST_TUPLE)) - HOST_ARCH := $(word 1,$(HOST_TUPLE_WORDS)) - HOST_VENDOR := $(word 2,$(HOST_TUPLE_WORDS)) - HOST_OS := $(word 3,$(HOST_TUPLE_WORDS)) - HOST_ABI := $(word 4,$(HOST_TUPLE_WORDS)) - HOST_TRIPLET := $(HOST_ARCH)-$(HOST_OS)-$(HOST_ABI) -endif - ifneq ($(TARGET_TUPLE),) TARGET_TUPLE_WORDS ?= $(subst -, ,$(TARGET_TUPLE)) TARGET_ARCH ?= $(word 1,$(TARGET_TUPLE_WORDS))