From e1fef7c8c7ae7a3a170dc6bd23e37db6763b7a3c Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Sat, 31 Oct 2015 14:41:09 -0400
Subject: build system: fix support of CC, CPP, and CXX directly passed to
 configure.

---
 sysinfo/toolchain/clang.mk   | 20 +++++++++++++++++---
 sysinfo/toolchain/cparser.mk | 20 +++++++++++++++++---
 sysinfo/toolchain/gcc.mk     | 20 +++++++++++++++++---
 3 files changed, 51 insertions(+), 9 deletions(-)

(limited to 'sysinfo')

diff --git a/sysinfo/toolchain/clang.mk b/sysinfo/toolchain/clang.mk
index ae8b40c..3e4a795 100644
--- a/sysinfo/toolchain/clang.mk
+++ b/sysinfo/toolchain/clang.mk
@@ -7,9 +7,23 @@ else
 endif
 
 
-CC 		= $(NATIVE_CC) $(CROSS_HOST_SPEC)
-CPP 		= $(NATIVE_CC) $(CROSS_HOST_SPEC) -E
-CXX 		= $(NATIVE_CC)++ $(CROSS_HOST_SPEC)
+ifeq ($(USER_CC)x,x)
+	CC	= $(NATIVE_CC) $(CROSS_HOST_SPEC)
+else
+	CC	= $(USER_CC) $(CROSS_HOST_SPEC)
+endif
+
+ifeq ($(USER_CPP)x,x)
+	CPP	= $(NATIVE_CC) $(CROSS_HOST_SPEC) -E
+else
+	CPP	= $(USER_CPP) $(CROSS_HOST_SPEC) -E
+endif
+
+ifeq ($(USER_CXX)x,x)
+	CXX	= $(NATIVE_CC)++ $(CROSS_HOST_SPEC)
+else
+	CXX	= $(USER_CXX) $(CROSS_HOST_SPEC)
+endif
 
 
 AS 		= $(CROSS_COMPILE)as
diff --git a/sysinfo/toolchain/cparser.mk b/sysinfo/toolchain/cparser.mk
index c55dbe0..762a6e6 100644
--- a/sysinfo/toolchain/cparser.mk
+++ b/sysinfo/toolchain/cparser.mk
@@ -7,9 +7,23 @@ else
 endif
 
 
-CC 		= $(NATIVE_CC) $(CROSS_HOST_SPEC) -Wno-experimental -integrated-cpp
-CPP 		= $(NATIVE_CC) $(CROSS_HOST_SPEC) -Wno-experimental -integrated-cpp -E
-CXX 		= $(NATIVE_CC) $(CROSS_HOST_SPEC) -Wno-experimental -integrated-cpp -std=c++
+ifeq ($(USER_CC)x,x)
+	CC	= $(NATIVE_CC) $(CROSS_HOST_SPEC) -Wno-experimental -integrated-cpp
+else
+	CC	= $(USER_CC) $(CROSS_HOST_SPEC) -Wno-experimental -integrated-cpp
+endif
+
+ifeq ($(USER_CPP)x,x)
+	CPP	= $(NATIVE_CC) $(CROSS_HOST_SPEC) -Wno-experimental -integrated-cpp -E
+else
+	CPP	= $(USER_CPP) $(CROSS_HOST_SPEC) -Wno-experimental -integrated-cpp -E
+endif
+
+ifeq ($(USER_CXX)x,x)
+	CXX	= $(NATIVE_CC) $(CROSS_HOST_SPEC) -Wno-experimental -integrated-cpp -std=c++
+else
+	CXX	= $(USER_CXX) $(CROSS_HOST_SPEC) -Wno-experimental -integrated-cpp -std=c++
+endif
 
 
 AS 		= $(CROSS_COMPILE)as
diff --git a/sysinfo/toolchain/gcc.mk b/sysinfo/toolchain/gcc.mk
index 933fb48..e0ad0d2 100644
--- a/sysinfo/toolchain/gcc.mk
+++ b/sysinfo/toolchain/gcc.mk
@@ -1,6 +1,20 @@
-CC 		= $(CROSS_COMPILE)$(NATIVE_CC)
-CPP 		= $(CROSS_COMPILE)cpp
-CXX 		= $(CROSS_COMPILE)c++
+ifeq ($(USER_CC)x,x)
+	CC	= $(CROSS_COMPILE)$(NATIVE_CC)
+else
+	CC	= $(USER_CC)
+endif
+
+ifeq ($(USER_CPP)x,x)
+	CPP	= $(CROSS_COMPILE)cpp
+else
+	CPP	= $(USER_CPP)
+endif
+
+ifeq ($(USER_CXX)x,x)
+	CXX	= $(CROSS_COMPILE)c++
+else
+	CXX	= $(USER_CXX)
+endif
 
 
 AS 		= $(CROSS_COMPILE)as
-- 
cgit v1.2.3