janware/jw-pkg
1
mirror of ssh://git.janware.com/janware/proj/jw-pkg synced 2026-04-24 09:13:37 +02:00
Code Activity Actions
jw-pkg/make/platform.mk

227 lines
7.3 KiB
Makefile
Raw Normal View History

make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
# ----- host and target variables
ifndef PLATFORM_MK_INCLUDED
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
PLATFORM_MK_INCLUDED = true
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
defs.mk, platform.mk: Include pre-local.mk and cache.mk from platform.mk platform.mk is sometimes included before defs.mk, e.g. from $(TOPDIR)/make/proj.mk, then these definitions are necessary Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 09:56:11 +00:00
# "-include" tries search path, we don't want that
define try_include
ifneq ($$(wildcard $(1)),)
include $(1)
endif
endef
make: Install cache-projects.mk .cache-projects.mk is not installed / packaged, which makes builds against an installed jw-pkg considerably slower. Change that, at the risk of making the installed jw-pkg-devel less versatile. This commit installs a cache file cache-projects.mk, renamed from .cache-projects.mk, because there's no justification for hiding an installed makefile. At least I can't think of one. Signed-off-by: Jan Lindemann <jan@janware.com>
2026-02-01 09:50:49 +01:00
CACHE_PROJECTS_MK := $(JWBDIR)/cache-projects.mk
$(eval $(call try_include,$(CACHE_PROJECTS_MK)))
make/[Makefile|*.mk): Improve variable caching This commit aims at improving speed by using better caching. - Makefile, cache.mk: Split .cache.mk up To allow caching of runtime path variables which are project-specific, split .cache.mk up in .cache-project.mk and .cache-projects.mk - ldlibpath.mk: Cache ldlibpath, exepath and pythonpath Place the output of $(call proj_query ldlibpath), $(call proj_query, exepath) and $(call proj_query pythonpath) in JW_PKG_LD_LIBRARY_PATH, JW_PKG_EXE_PATH, and JW_PKG_PYTHON_PATH respectively, and cache the variables in make/.project-cache.mk. - cache.mk: Use = instead of := Recursively expanded variables are nearly as fast as := variables if the assigned value is a fixed string. And sometimes it's not, rightly so, because variables get assigned below, as with JW_PKG_XXX for instance. - cache.mk: Use $(TOPDIR) as variable values Replace absolute references to project's topdir by $(TOPDIR) with sed. As soon as the project queries produce absolute paths, they will be transformed into relative paths which allow the code base to be moved to a different location and still remain functional without a rebuild. Signed-off-by: Jan Lindemann <jan@janware.com>
2026-01-22 14:12:58 +01:00
$(eval $(call try_include,$(TOPDIR)/make/.cache-project.mk))
Everywhere: Rename MODDIR -> JWBDIR Rename the omnipresent MODDIR variable to JWBDIR, since that's more to the point. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-29 21:34:18 +00:00
$(eval $(call try_include,$(JWBDIR)/make/pre-local.mk))
defs.mk, platform.mk: Include pre-local.mk and cache.mk from platform.mk platform.mk is sometimes included before defs.mk, e.g. from $(TOPDIR)/make/proj.mk, then these definitions are necessary Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 09:56:11 +00:00
$(eval $(call try_include,$(TOPDIR)/make/pre-local.mk))
$(eval $(call try_include,pre-local.mk))
projects.mk -> platform.mk: Move definitions up To remove redundancy, get-os.sh needs to be retired in favor of pkg.py distro info. It's needed in platform.mk, but the only definiton of JW_PKG_PY is in projects.mk, so move it, along with the variables essential for the command: include $(JWBDIR)/make/py-version.mk (defining PYTHON) JW_PKG_PY DEVELOPMENT VERSION_FILE Signed-off-by: Jan Lindemann <jan@janware.com>
2026-03-02 10:27:14 +01:00
# -- What do I know about myself?
VERSION_FILE ?= $(firstword $(wildcard VERSION) $(TOPDIR)/VERSION)
ifndef DEVELOPMENT
ifeq ($(wildcard $(VERSION_FILE)),)
DEVELOPMENT := true
else
DEVELOPMENT := $(shell grep -q 'dev' $(VERSION_FILE) && echo true)
endif
endif
# -- Conclude the build system's location:
ifeq ($(PROJECTS_DIR),)
ifeq ($(DEVELOPMENT),true)
PROJECTS_DIR ?= $(TOPDIR)/..
else
PROJECTS_DIR ?= /opt
endif
endif
platform.mk / defs.mk fix: SHELL was referenced before definition SHELL defaults to /bin/sh on Ubuntu 16, and was used to get-os.sh, which fails Signed-off-by: Jan Lindemann <jan@janware.com>
2019-08-02 05:48:32 +00:00
ifeq ($(MAKE_BENCHMARK),true)
export SHELL := /bin/bash $(JWB_SCRIPT_DIR)/timed-make-shell.sh
else
export SHELL := /bin/bash
endif
Everywhere: Rename MOD_SCRIPT_DIR -> JWB_SCRIPT_DIR Follow name change of MODDIR -> JWBDIR. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-29 21:45:24 +00:00
JWB_SCRIPT_DIR := $(firstword $(wildcard $(JWBDIR)/scripts $(JWBDIR)/bin))
projects.mk -> platform.mk: Move definitions up To remove redundancy, get-os.sh needs to be retired in favor of pkg.py distro info. It's needed in platform.mk, but the only definiton of JW_PKG_PY is in projects.mk, so move it, along with the variables essential for the command: include $(JWBDIR)/make/py-version.mk (defining PYTHON) JW_PKG_PY DEVELOPMENT VERSION_FILE Signed-off-by: Jan Lindemann <jan@janware.com>
2026-03-02 10:27:14 +01:00
include $(JWBDIR)/make/py-version.mk
JW_PKG_PY = $(PYTHON) $(JWB_SCRIPT_DIR)/jw-pkg.py -p $(PROJECTS_DIR) -t $(TOPDIR) --topdir-format absolute $(JW_PKG_PY_EXTRA_OPTS)
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
ifndef GET_OS_SH
Everywhere: Rename MOD_SCRIPT_DIR -> JWB_SCRIPT_DIR Follow name change of MODDIR -> JWBDIR. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-29 21:45:24 +00:00
GET_OS_SH := $(SHELL) $(JWB_SCRIPT_DIR)/get-os.sh
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
endif
make: Improve flash-fetch targets - Add support MCU_FLASH_BANK_NAME to support multiple banks - Prefix binaries with TARGET_PRODUCT, if defined - Fix flash data for stm32f769i-disco Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-29 13:32:16 +00:00
# -- product
TARGET_PRODUCTS_ARM_NONE_EABI = \
st-nucleo-f103rb \
defs-cpp.mk, platform.mk: Add support for st-disc1-f429i Signed-off-by: Jan Lindemann <jan@janware.com>
2019-04-04 14:36:38 +00:00
st-disc1-f429i \
make: Improve flash-fetch targets - Add support MCU_FLASH_BANK_NAME to support multiple banks - Prefix binaries with TARGET_PRODUCT, if defined - Fix flash data for stm32f769i-disco Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-29 13:32:16 +00:00
st-disco-f769i
TAGGED_TMPL_TAGS_ARM_NONE_EABI ?= $(TARGET_PRODUCTS_ARM_NONE_EABI)
TARGET_PRODUCTS += \
$(TARGET_PRODUCTS_ARM_NONE_EABI)
TARGET_PRODUCT = $(firstword $(foreach t,$(TAGGED_TMPL_TAGS),$(filter $(t),$(TARGET_PRODUCTS))))
TAGGED_TMPL_MAKEFILES = $(wildcard $(addsuffix .mk,$(foreach t,$(TAGGED_TMPL_DIRS),$(addprefix $(t)/,$(TAGGED_TMPL_TAGS)))))
ifneq ($(foreach t,$(TAGGED_TMPL_TAGS),$(filter $(t),$(TAGGED_TMPL_TAGS_ARM_NONE_EABI))),)
TARGET_TRIPLET ?= arm-none-eabi
endif
# -- arch, vendor, os, libc
platform.mk: Add support for explicit TARGET = linux Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 19:49:54 +00:00
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
platform.mk: Fix ifndef TARGET condition
2009-07-12 19:30:17 +00:00
ifndef TARGET
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
ifneq ($(subst mingw,,$(CWD)),$(CWD))
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
TARGET := mingw
$(MODDIR)/make/defs.mk: Split off defs-cpp.mk with C++ definitions C++ definitions are numerous, and they shouldn't pollute variable space and performance outside of directories containing C++ files. This commit pushes them into a defs-cpp.mk file. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-02-27 20:46:54 +00:00
endif
platform.mk: Add file
2009-07-09 11:53:53 +00:00
endif
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
DEFINE_FROM_TARGET := false
ifdef TARGET
ifndef TARGET_TUPLE
ifndef TARGET_TRIPLET
DEFINE_FROM_TARGET := true
endif
else ifndef TARGET_TRIPLET
ifndef TARGET_TUPLE
DEFINE_FROM_TARGET := true
endif
endif
ifeq ($(DEFINE_FROM_TARGET),true)
ifeq ($(TARGET),mingw)
TARGET_ARCH ?= i686
TARGET_ABI := mingw32
TARGET_OS ?= w64
else ifeq ($(TARGET),mingw32)
TARGET_ARCH ?= i686
TARGET_ABI := mingw32
TARGET_OS ?= w64
else ifeq ($(TARGET),mingw64)
TARGET_ARCH ?= x86_64
TARGET_ABI := mingw64
TARGET_OS := w64
platform.mk: Add support for explicit TARGET = linux Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 19:49:54 +00:00
else ifeq ($(TARGET),linux)
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
endif
platform.mk: Add support for explicit TARGET = linux Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 19:49:54 +00:00
# -- fall back on defaults
TARGET_ARCH ?= $(HOST_ARCH)
TARGET_VENDOR ?= $(HOST_VENDOR)
TARGET_OS ?= $(HOST_OS)
TARGET_ABI ?= $(HOST_ABI)
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
endif
TARGET_TUPLE := $(TARGET_ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(TARGET_ABI)
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
endif
platform.mk: Add file
2009-07-09 11:53:53 +00:00
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
ifneq ($(TARGET_TUPLE),)
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
TARGET_TUPLE_WORDS ?= $(subst -, ,$(TARGET_TUPLE))
TARGET_ARCH ?= $(word 1,$(TARGET_TUPLE_WORDS))
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)
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
else ifneq ($(TARGET_TRIPLET),)
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
TARGET_TRIPLET_WORDS ?= $(subst -, ,$(TARGET_TRIPLET))
TARGET_ARCH ?= $(word 1,$(TARGET_TRIPLET_WORDS))
TARGET_VENDOR ?= unknown
TARGET_OS ?= $(word 2,$(TARGET_TRIPLET_WORDS))
TARGET_ABI ?= $(word 3,$(TARGET_TRIPLET_WORDS))
TARGET_TUPLE ?= $(TARGET_ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(TARGET_ABI)
TARGET_TUPLE_WORDS ?= $(subst -, ,$(TARGET_TUPLE))
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
else
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
TARGET_TUPLE ?= $(HOST_TUPLE)
TARGET_TUPLE_WORDS ?= $(subst -, ,$(TARGET_TUPLE))
TARGET_ARCH ?= $(word 1,$(TARGET_TUPLE_WORDS))
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_WORDS ?= $(subst -, ,$(TARGET_TRIPLET))
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
endif
ifeq ($(TARGET_TUPLE),)
$(error TARGET_TUPLE is empty)
endif
platform.mk: Fix undefined SYSTEM_LIBDIR variable Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-17 15:28:24 +00:00
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)
Everywhere: Rename package "jw-build" to "jw-pkg" jw-build doesn't stop at building software, packaging it afterwards is also a core feature, so this commit gives the package a better name. The commit replaces strings s/jw-build/jw-pkg/ in text files and file names. Fallout to the functionality is fixed, variable names are left as they are, though. To be adjusted by later commits. Signed-off-by: Jan Lindemann <jan@janware.com>
2025-11-26 17:48:01 +01:00
# - support legacy jw-pkg target variables
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
ifneq ($(findstring $(TARGET_ABI),mingw mingw32 mingw64),)
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
TARGET ?= mingw
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
else
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
TARGET ?= $(TARGET_OS)
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
endif
ifeq ($(OS_NAME_VERSION),)
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
OS_NAME_VERSION := $(shell $(GET_OS_SH))
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
endif
ifeq ($(OS_NAME),)
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
OS_NAME := $(shell $(GET_OS_SH) name)
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
endif
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
ARCH ?= $(TARGET_ARCH)
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
ARCH_32 = i586
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
ifndef ARCH
# TODO unreached code, test and fix this
ifeq ($(shell uname -m),armv7l)
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
ARCH = armv7hl
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
else ifeq ($(shell uname -m),armv6l)
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
ARCH = armv6hl
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
else ifeq ($(shell uname -m),aarch64)
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
ARCH = aarch64
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
else ifeq ($(shell uname -m),x86_64)
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
ARCH = x86_64
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
else
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
ARCH = $(ARCH_32)
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
endif
endif
make/Makefile, defs-cpp.mk, platform.mk: Generalize MinGW build machinery (a bit) This commit takes the MinGW cross compilation further into the direction of being a more general framework for cross compilation. Changed some variable names that are too specialized, notably MinGW tool chain directories, compilers, utilities. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 10:45:08 +00:00
ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET))
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
ifeq ($(TARGET),mingw)
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
FLAVOUR_PREFIX ?= win32-
FLAVOUR_SUFFIX ?= -win32
FLAVOUR_PATH_PREFIX ?= win32/
FLAVOUR_PATH_SUFFIX ?= /win32
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
else
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30 Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
FLAVOUR_PREFIX ?= $(TARGET_TRIPLET)-
FLAVOUR_SUFFIX ?= -$(TARGET_TRIPLET)
FLAVOUR_PATH_PREFIX ?= $(TARGET_TRIPLET)/
FLAVOUR_PATH_SUFFIX ?= /$(TARGET_TRIPLET)
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
endif
endif
defs-cpp.mk, defs.mk, platform.mk: More cleanup to defs-cpp.mk - Group more consistently into overall default choices, template cascade and compiler flags - Add definitions for st-nucleo-f103rb (for now) Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-20 15:06:25 +00:00
TARGET_CPU ?= $(TARGET_ARCH)
make: Fix MinGW build machinery machinery This commit makes it possible to successfully run "make all" against ytools' again, with TARGET_TUPLE set to i686-ms-w64-mingw. Lots of minor and major tweaks here and there. The biggest diff is a move of the architecture-related definitions into platform.mk. The are needed pretty early on, so that seems reasonable. Making this work again is part of the larger effort to support cross buildchains in a more concise way, i.e. without so many if ($(TARGET),mingw)) all over the place. TARGET's relevance should dwindle, until it's finally taken over by the TARGET_XXX variables extracted from TARGET_TUPLE or TARGET_TRIPLET. Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-02 17:21:48 +00:00
endif # ifndef PLATFORM_MK_INCLUDED
Copy permalink