From 58b6567bef43e0dd72d37c05144ccf15809de47a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 9 Dec 2015 21:58:15 +0100 Subject: quirks needed globally --- mk/os.mk | 5 +++++ rules.mk | 1 + toolchain/gcc/Makefile | 1 - toolchain/uclibc-ng/Makefile | 3 +++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/mk/os.mk b/mk/os.mk index 38a2e53f3..31d5dd789 100644 --- a/mk/os.mk +++ b/mk/os.mk @@ -6,6 +6,11 @@ ifeq (${OStype},Darwin) HOST_CC:=clang -fbracket-depth=1024 HOST_CXX:=clang++ -fbracket-depth=1024 else +ifeq (${OStype},FreeBSD) +HOST_CC:=clang -fbracket-depth=1024 +HOST_CXX:=clang++ -fbracket-depth=1024 +else HOST_CC:=${CC} HOST_CXX:=${CXX} endif +endif diff --git a/rules.mk b/rules.mk index 9468f9d46..25944c30c 100644 --- a/rules.mk +++ b/rules.mk @@ -2,6 +2,7 @@ # material, please see the LICENCE file in the top-level directory. include $(ADK_TOPDIR)/prereq.mk +include $(ADK_TOPDIR)/mk/os.mk -include $(ADK_TOPDIR)/.config ifeq ($(ADK_VERBOSE),1) diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index d766c2c32..49e035800 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -4,7 +4,6 @@ include $(ADK_TOPDIR)/rules.mk include ../rules.mk include Makefile.inc -include $(ADK_TOPDIR)/mk/os.mk # disable SSP for libstdc++ ifeq ($(ADK_TARGET_LIB_MUSL),y) diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index 71edbf1b4..526009a24 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -290,6 +290,7 @@ endif $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured PATH='$(HOST_PATH)' $(MAKE) $(UCLIBC_MAKEOPTS) -C $(WRKBUILD) \ + HOSTCC="$(HOST_CC)" \ CC='$(TARGET_CC)' \ PREFIX= \ DEVEL_PREFIX=/usr/ \ @@ -303,6 +304,7 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ + HOSTCC="$(HOST_CC)" \ CC='$(TARGET_CC)' \ PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ @@ -313,6 +315,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled VERBOSE=1 \ install_runtime install_dev PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ + HOSTCC="$(HOST_CC)" \ CC='$(TARGET_CC)' \ PREFIX= \ DEVEL_PREFIX=/usr/ \ -- cgit v1.2.3