summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2015-10-28 01:47:08 -0400
committermidipix <writeonce@midipix.org>2016-11-10 23:35:23 -0500
commit05c9b561ebd8fffca79b0d835ec50bf4d946aa57 (patch)
tree90aad653f15e7eca809cacb46b64cb0802e1ee49
parentcdbf52235aa596f3dd04de6f35631eeb1219ea45 (diff)
downloadperk-05c9b561ebd8fffca79b0d835ec50bf4d946aa57.tar.bz2
perk-05c9b561ebd8fffca79b0d835ec50bf4d946aa57.tar.xz
build system: include host definitions prior to toolchain definitions and fix CC accordingly.
-rw-r--r--Makefile.in2
-rw-r--r--sysinfo/host/native.mk1
-rw-r--r--sysinfo/toolchain/gcc.mk2
3 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index 95daa37..4632564 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++