From 079bdf1c91d5e83c179103caca33625bc5540cd8 Mon Sep 17 00:00:00 2001
From: bRad <brad@humanenginuity.com>
Date: Wed, 10 May 2017 04:48:59 -0700
Subject: Added CT_TestAndAbort trivial sanity checks for CC and CXX to avoid
 libiconnv build failures
 https://github.com/crosstool-ng/crosstool-ng/issues/711


diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index 68d6847..6313f32 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -60,6 +60,9 @@ CT_TestAndAbort "Don't set CPLUS_INCLUDE_PATH. It screws up the build." -n "${CP
 CT_TestAndAbort "Don't set OBJC_INCLUDE_PATH. It screws up the build." -n "${OBJC_INCLUDE_PATH}"
 CT_TestAndAbort "Don't set CFLAGS. It screws up the build." -n "${CFLAGS}"
 CT_TestAndAbort "Don't set CXXFLAGS. It screws up the build." -n "${CXXFLAGS}"
+CT_TestAndAbort "Don't set CC.  Support is planned, but currently it screws up the build. Ensure the GCC you
+want to use is the first 'gcc' instance in your \${PATH} environment variable." -n "${CC}"
+CT_TestAndAbort "Don't set CXX. It screws up the build." -n "${CXX}"
 CT_Test "GREP_OPTIONS screws up the build. Resetting." -n "${GREP_OPTIONS}"
 export GREP_OPTIONS=
 # Workaround against openSUSE 12.1 that breaks ./configure for cross-compilation:
-- 
cgit v0.10.2-6-g49f6


From f4ef083099c4bb8f577772298d2478c9f53831e6 Mon Sep 17 00:00:00 2001
From: bRad <brad@humanenginuity.com>
Date: Wed, 10 May 2017 07:23:53 -0700
Subject: Fixed up representation of PATH env. var in error message


diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index 6313f32..09903d1 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -61,7 +61,7 @@ CT_TestAndAbort "Don't set OBJC_INCLUDE_PATH. It screws up the build." -n "${OBJ
 CT_TestAndAbort "Don't set CFLAGS. It screws up the build." -n "${CFLAGS}"
 CT_TestAndAbort "Don't set CXXFLAGS. It screws up the build." -n "${CXXFLAGS}"
 CT_TestAndAbort "Don't set CC.  Support is planned, but currently it screws up the build. Ensure the GCC you
-want to use is the first 'gcc' instance in your \${PATH} environment variable." -n "${CC}"
+want to use is the first 'gcc' instance in your PATH environment variable." -n "${CC}"
 CT_TestAndAbort "Don't set CXX. It screws up the build." -n "${CXX}"
 CT_Test "GREP_OPTIONS screws up the build. Resetting." -n "${GREP_OPTIONS}"
 export GREP_OPTIONS=
-- 
cgit v0.10.2-6-g49f6


From 8543414be6a9d38bdd451730ed3cc32bf39e5a21 Mon Sep 17 00:00:00 2001
From: bRad <brad@humanenginuity.com>
Date: Wed, 10 May 2017 13:00:23 -0700
Subject: Simplified error message for CC


diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index 09903d1..1464f0f 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -60,8 +60,7 @@ CT_TestAndAbort "Don't set CPLUS_INCLUDE_PATH. It screws up the build." -n "${CP
 CT_TestAndAbort "Don't set OBJC_INCLUDE_PATH. It screws up the build." -n "${OBJC_INCLUDE_PATH}"
 CT_TestAndAbort "Don't set CFLAGS. It screws up the build." -n "${CFLAGS}"
 CT_TestAndAbort "Don't set CXXFLAGS. It screws up the build." -n "${CXXFLAGS}"
-CT_TestAndAbort "Don't set CC.  Support is planned, but currently it screws up the build. Ensure the GCC you
-want to use is the first 'gcc' instance in your PATH environment variable." -n "${CC}"
+CT_TestAndAbort "Don't set CC. It screws up the build." -n "${CC}"
 CT_TestAndAbort "Don't set CXX. It screws up the build." -n "${CXX}"
 CT_Test "GREP_OPTIONS screws up the build. Resetting." -n "${GREP_OPTIONS}"
 export GREP_OPTIONS=
-- 
cgit v0.10.2-6-g49f6