From 02c4a1cc1466c4b4bc673bc72c506eb8c053b29c Mon Sep 17 00:00:00 2001 From: midipix Date: Sat, 31 Oct 2015 14:23:11 -0400 Subject: build system: include host definitions prior to toolchain definitions and fix CC accordingly. --- Makefile.in | 2 +- sysinfo/host/native.mk | 1 - sysinfo/toolchain/gcc.mk | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index d49acb8..b5d4af5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -55,8 +55,8 @@ static: -include $(PROJECT_DIR)/sysinfo/toolchain/$(TOOLCHAIN).mk include $(PROJECT_DIR)/sysinfo/host/$(HOST).mk +include $(PROJECT_DIR)/sysinfo/toolchain/$(TOOLCHAIN).mk include $(PROJECT_DIR)/project/defs.mk include $(PROJECT_DIR)/project/tree.mk diff --git a/sysinfo/host/native.mk b/sysinfo/host/native.mk index 465a01b..08b02b6 100644 --- a/sysinfo/host/native.mk +++ b/sysinfo/host/native.mk @@ -1,6 +1,5 @@ include $(PROJECT_DIR)/sysinfo/os/$(NATIVE_OS).mk -CC = $(CROSS_COMPILE)$(NATIVE_CC) OS = $(NATIVE_OS) HOST_BITS = $(NATIVE_OS_BITS) HOST_UNDERSCORE = $(NATIVE_OS_UNDERSCORE) diff --git a/sysinfo/toolchain/gcc.mk b/sysinfo/toolchain/gcc.mk index 441a2ca..933fb48 100644 --- a/sysinfo/toolchain/gcc.mk +++ b/sysinfo/toolchain/gcc.mk @@ -1,4 +1,4 @@ -CC = $(CROSS_COMPILE)gcc +CC = $(CROSS_COMPILE)$(NATIVE_CC) CPP = $(CROSS_COMPILE)cpp CXX = $(CROSS_COMPILE)c++ -- cgit v1.2.3