diff options
author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-10-17 21:44:48 +0200 |
---|---|---|
committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-10-17 21:46:45 +0200 |
commit | 4734b2366280962ed76c8be2fb07f73403578385 (patch) | |
tree | d1fcdcbaf5a65528737180413d857edef2eed530 | |
parent | 88c8044622b4b232c937eb24717c30132de5b253 (diff) | |
download | embtoolkit-4734b2366280962ed76c8be2fb07f73403578385.tar.gz embtoolkit-4734b2366280962ed76c8be2fb07f73403578385.tar.bz2 embtoolkit-4734b2366280962ed76c8be2fb07f73403578385.tar.xz |
Bluid system: move host system detection to a dedicated .mk
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r-- | Makefile | 48 | ||||
-rw-r--r-- | core/mk/host-support.mk | 83 | ||||
-rw-r--r-- | core/mk/targetsys.mk | 27 | ||||
-rw-r--r-- | packages/htools/pkgconf/vars.mk | 1 |
4 files changed, 92 insertions, 67 deletions
@@ -39,53 +39,13 @@ EMBTK_VERSION := \ echo $$version; \ fi; \ else echo $$dversion; fi) -EMBTK_BUGURL = "http://bugs.embtoolkit.org/projects/embtoolkit" -EMBTK_HOMEURL = "http://www.embtoolkit.org" -export EMBTK_BUGURL EMBTK_HOMEURL EMBTK_VERSION +EMBTK_BUGURL := "http://bugs.embtoolkit.org/projects/embtoolkit" +EMBTK_HOMEURL := "http://www.embtoolkit.org" EMBTK_ROOT := $(shell pwd) -EMBTK_DOTCONFIG := $(EMBTK_ROOT)/.config +EMBTK_DOTCONFIG := "$(EMBTK_ROOT)/.config" -# SHELL used by kbuild -CONFIG_EMBTK_SHELL := \ - $(shell \ - if [ -x "$$BASH" ]; then \ - echo $$BASH; \ - else \ - if [ -x /bin/bash ]; then \ - echo /bin/bash; \ - else \ - echo /bin/sh; \ - fi; \ - fi) - -HOST_ARCH := $(shell $(CONFIG_EMBTK_SHELL) $(EMBTK_ROOT)/scripts/config.guess) -HOST_BUILD := $(HOST_ARCH) -export HOST_ARCH HOST_BUILD - -HOSTCC := \ - $(shell \ - if [ -n "$$(command -v gcc 2>/dev/null)" ]; then \ - echo "$$(command -v gcc)"; \ - elif [ -n "$$(command -v cc 2>/dev/null)" ]; then \ - echo "$$(command -v cc 2>/dev/null)"; \ - else \ - echo gcc; \ - fi) - -HOSTCXX := \ - $(shell \ - if [ -n "$$(command -v g++ 2>/dev/null)" ]; then \ - echo "$$(command -v g++)"; \ - elif [ -n "$$(command -v c++ 2>/dev/null)" ]; then \ - echo "$$(command -v c++ 2>/dev/null)"; \ - else \ - echo g++; \ - fi) - -HOSTCFLAGS := -Wall -HOSTCXXFLAGS := -O2 -export HOSTCC HOSTCXX HOSTCFLAGS HOSTCXXFLAGS +include core/mk/host-support.mk ifeq ($(V),) Q := @ diff --git a/core/mk/host-support.mk b/core/mk/host-support.mk new file mode 100644 index 0000000..825b858 --- /dev/null +++ b/core/mk/host-support.mk @@ -0,0 +1,83 @@ +################################################################################ +# Embtoolkit +# Copyright(C) 2009-2014 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>. +# +# This program is free software; you can distribute it and/or modify it +# under the terms of the GNU General Public License +# (Version 2 or later) published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +################################################################################ +# +# \file host-support.mk +# \brief Host support +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> +# \date October 2014 +################################################################################ + +# +# Host development machine info +# + +CONFIG_EMBTK_SHELL := /bin/sh +HOST_ARCH := $(shell $(CONFIG_EMBTK_SHELL) $(EMBTK_ROOT)/scripts/config.guess) +HOST_BUILD := $(HOST_ARCH) +export HOST_ARCH HOST_BUILD + +ifeq ($(findstring linux,$(HOST_ARCH)),linux) +embtk_buildhost_os := linux +embtk_buildhost_os_type := linux +else ifeq ($(findstring freebsd,$(HOST_ARCH)),freebsd) +embtk_buildhost_os := freebsd +embtk_buildhost_os_type := bsd +else ifeq ($(findstring netbsd,$(HOST_ARCH)),netbsd) +embtk_buildhost_os := netbsd +embtk_buildhost_os_type := bsd +else ifeq ($(findstring openbsd,$(HOST_ARCH)),openbsd) +embtk_buildhost_os := openbsd +embtk_buildhost_os_type := bsd +else ifeq ($(findstring apple,$(HOST_ARCH)),apple) +embtk_buildhost_os := macos +embtk_buildhost_os_type := bsd +else +embtk_buildhost_os := unknown-host-os +endif + +HOSTCC := \ + $(shell \ + if [ -n "$$(command -v gcc 2>/dev/null)" ]; then \ + echo "$$(command -v gcc)"; \ + elif [ -n "$$(command -v cc 2>/dev/null)" ]; then \ + echo "$$(command -v cc)"; \ + else \ + echo gcc; \ + fi) + +HOSTCXX := \ + $(shell \ + if [ -n "$$(command -v g++ 2>/dev/null)" ]; then \ + echo "$$(command -v g++)"; \ + elif [ -n "$$(command -v c++ 2>/dev/null)" ]; then \ + echo "$$(command -v c++)"; \ + else \ + echo g++; \ + fi) + +HOSTCFLAGS := -Wall -O2 +HOSTCXXFLAGS := -Wall -O2 +HOSTLDFLAGS := + +ifeq ($(embtk_buildhost_os),macos) +HOSTCFLAGS += -I/opt/local/include +HOSTLDFLAGS += -L/opt/local/lib +endif +HOSTCXXFLAGS := $(HOSTCFLAGS) + +export HOSTCC HOSTCXX HOSTCFLAGS HOSTCXXFLAGS HOSTLDFLAGS diff --git a/core/mk/targetsys.mk b/core/mk/targetsys.mk index 093fb7b..ab76ac4 100644 --- a/core/mk/targetsys.mk +++ b/core/mk/targetsys.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2012 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>. +# Copyright(C) 2009-2014 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>. # # This program is free software; you can distribute it and/or modify it # under the terms of the GNU General Public License @@ -23,6 +23,9 @@ # \date October 2012 ################################################################################ +# +# Target machine info +# embtk_os-$(CONFIG_EMBTK_OS_LINUX) := linux embtk_os := $(or $(embtk_os-y),invalid-os) @@ -32,25 +35,3 @@ embtk_clib-$(CONFIG_EMBTK_CLIB_MUSL) := musl embtk_clib-$(CONFIG_EMBTK_CLIB_UCLIBC) := uclibc embtk_clib := $(or $(embtk_clib-y),invalid-clib) embtk_clib_version := $(call embtk_get_pkgversion,$(embtk_clib)) - -# -# Host development machine info -# -ifeq ($(findstring linux,$(HOST_ARCH)),linux) -embtk_buildhost_os := linux -embtk_buildhost_os_type := linux -else ifeq ($(findstring freebsd,$(HOST_ARCH)),freebsd) -embtk_buildhost_os := freebsd -embtk_buildhost_os_type := bsd -else ifeq ($(findstring netbsd,$(HOST_ARCH)),netbsd) -embtk_buildhost_os := netbsd -embtk_buildhost_os_type := bsd -else ifeq ($(findstring openbsd,$(HOST_ARCH)),openbsd) -embtk_buildhost_os := openbsd -embtk_buildhost_os_type := bsd -else ifeq ($(findstring apple,$(HOST_ARCH)),apple) -embtk_buildhost_os := macos -embtk_buildhost_os_type := bsd -else -embtk_buildhost_os := unknown-host-os -endif diff --git a/packages/htools/pkgconf/vars.mk b/packages/htools/pkgconf/vars.mk index 0d93fac..63c0963 100644 --- a/packages/htools/pkgconf/vars.mk +++ b/packages/htools/pkgconf/vars.mk @@ -16,6 +16,7 @@ __EMBTK_HOST_PKG_CONFIG_PATH += /usr/lib/pkgconfig/ /usr/share/pkgconfig/ __EMBTK_HOST_PKG_CONFIG_PATH += /usr/local/lib/pkgconfig/ /usr/local/share/pkgconfig/ __EMBTK_HOST_PKG_CONFIG_PATH += $(dir $(shell find /usr/lib -type f -name '*.pc' 2>/dev/null)) __EMBTK_HOST_PKG_CONFIG_PATH += $(dir $(shell find /usr/local/lib -type f -name '*.pc' 2>/dev/null)) +__EMBTK_HOST_PKG_CONFIG_PATH += $(dir $(shell find /opt/local -type f -name '*.pc' 2>/dev/null)) EMBTK_HOST_PKG_CONFIG_PATH := $(subst $(embtk_space),:,$(sort $(__EMBTK_HOST_PKG_CONFIG_PATH))) export EMBTK_HOST_PKG_CONFIG_PATH |