diff options
-rw-r--r-- | core/mk/host-support.mk | 57 |
1 files changed, 33 insertions, 24 deletions
diff --git a/core/mk/host-support.mk b/core/mk/host-support.mk index 4e900c3..8011d41 100644 --- a/core/mk/host-support.mk +++ b/core/mk/host-support.mk @@ -38,6 +38,38 @@ HOST_ARCH := $(shell $(CONFIG_EMBTK_SHELL) $(EMBTK_ROOT)/scripts/config.guess) HOST_BUILD := $(HOST_ARCH) export HOST_ARCH HOST_BUILD +HOSTJAVA := \ + $(shell \ + if [ -n "$$(command -v java 2>/dev/null)" ]; then \ + echo "$$(command -v java)"; \ + else \ + echo java; \ + fi) +HOSTJAVAC := \ + $(shell \ + if [ -n "$$(command -v javac 2>/dev/null)" ]; then \ + echo "$$(command -v javac)"; \ + else \ + echo javac; \ + fi) +HOSTJAR := \ + $(shell \ + if [ -n "$$(command -v jar 2>/dev/null)" ]; then \ + echo "$$(command -v jar)"; \ + else \ + echo jar; \ + fi) + +HOSTAWK := \ + $(shell \ + if [ -n "$$(command -v gawk 2>/dev/null)" ]; then \ + echo "$$(command -v gawk)"; \ + elif [ -n "$$(command -v awk 2>/dev/null)" ]; then \ + echo "$$(command -v awk)"; \ + else \ + echo gawk; \ + fi) + ifeq ($(findstring linux,$(HOST_ARCH)),linux) embtk_buildhost_os := linux embtk_buildhost_os_type := linux @@ -47,6 +79,7 @@ embtk_buildhost_os := freebsd embtk_buildhost_os_type := bsd embtk_buildhost-freebsd := y embtk_buildhost-bsd := y +embtk_buildhost-freebsd_version := $$(${HOSTAWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < /usr/include/sys/param.h) else ifeq ($(findstring netbsd,$(HOST_ARCH)),netbsd) embtk_buildhost_os := netbsd embtk_buildhost_os_type := bsd @@ -105,27 +138,3 @@ endif HOSTCXXFLAGS = $(HOSTCFLAGS) export HOSTCC HOSTCXX HOSTCFLAGS HOSTCXXFLAGS HOSTLDFLAGS - -HOSTJAVA := \ - $(shell \ - if [ -n "$$(command -v java 2>/dev/null)" ]; then \ - echo "$$(command -v java)"; \ - else \ - echo java; \ - fi) - -HOSTJAVAC := \ - $(shell \ - if [ -n "$$(command -v javac 2>/dev/null)" ]; then \ - echo "$$(command -v javac)"; \ - else \ - echo javac; \ - fi) - -HOSTJAR := \ - $(shell \ - if [ -n "$$(command -v jar 2>/dev/null)" ]; then \ - echo "$$(command -v jar)"; \ - else \ - echo jar; \ - fi) |