From 2a428ffd37ac702109c1701bd7be0ba543aa8dc3 Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Sat, 8 Dec 2018 13:05:05 +0800
Subject: [PATCH] Use CC, CXX from environment when available

---
 conf.pri.in  | 2 ++
 configure    | 8 ++++++++
 configure.ac | 6 ++++++
 3 files changed, 16 insertions(+)

diff --git a/conf.pri.in b/conf.pri.in
index 09ce6d1e5..1a9e84335 100644
--- a/conf.pri.in
+++ b/conf.pri.in
@@ -5,6 +5,8 @@ BINDIR = @EXPAND_BINDIR@
 DATADIR = @EXPAND_DATADIR@
 MANPREFIX = @EXPAND_MANDIR@
 
+QMAKE_CC = @QBT_CC@
+QMAKE_CXX = @QBT_CXX@
 QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@
 
 EXTERNAL_INCLUDES = @QBT_CONF_INCLUDES@
diff --git a/configure b/configure
index 47533ffb9..629bbba1e 100755
--- a/configure
+++ b/configure
@@ -595,6 +595,8 @@ QBT_REMOVE_CONFIG
 QBT_ADD_CONFIG
 QBT_CONF_EXTRA_CFLAGS
 QBT_CONF_INCLUDES
+QBT_CXX
+QBT_CC
 EXPAND_MANDIR
 EXPAND_DATADIR
 EXPAND_BINDIR
@@ -4178,6 +4180,10 @@ END
 fi
 
 
+# use compiler from env variables if available
+QBT_CC="$CC"
+QBT_CXX="$CXX"
+
 # Define --wth-* and --enable-* arguments
 
 
@@ -5795,6 +5801,8 @@ QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"
 
 
 
+
+
 ac_config_files="$ac_config_files conf.pri"
 
 cat >confcache <<\_ACEOF
diff --git a/configure.ac b/configure.ac
index 751403ba8..4591467d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,10 @@ AC_LANG(C++)
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE
 
+# use compiler from env variables if available
+QBT_CC="$CC"
+QBT_CXX="$CXX"
+
 # Define --wth-* and --enable-* arguments
 
 AC_ARG_WITH(qtsingleapplication,
@@ -275,6 +279,8 @@ extract "$CFLAGS $CXXFLAGS"
 QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"
 
 # Substitute the values of these vars in conf.pri.in
+AC_SUBST(QBT_CC)
+AC_SUBST(QBT_CXX)
 AC_SUBST(QBT_CONF_INCLUDES)
 AC_SUBST(QBT_CONF_EXTRA_CFLAGS)
 AC_SUBST(QBT_ADD_CONFIG)