Browse Source

quirks needed globally

Waldemar Brodkorb 8 years ago
parent
commit
58b6567bef
4 changed files with 9 additions and 1 deletions
  1. 5 0
      mk/os.mk
  2. 1 0
      rules.mk
  3. 0 1
      toolchain/gcc/Makefile
  4. 3 0
      toolchain/uclibc-ng/Makefile

+ 5 - 0
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

+ 1 - 0
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)

+ 0 - 1
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)

+ 3 - 0
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/ \