From 33f2e4bb196ab1f6aa70d40662a5c3ba04b54565 Mon Sep 17 00:00:00 2001
From: NicJA <NicJA@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Mon, 2 Feb 2015 04:55:12 +0000
Subject: [PATCH] use aros_target_toolchain to determine if we need to use the
 wrappers

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@49990 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 configure    | 41 +++++++++++++++++++---------------------
 configure.in | 61 +++++++++++++++++++++++++++++-------------------------------
 2 files changed, 48 insertions(+), 54 deletions(-)

diff --git a/configure b/configure
index 219454dff0..1dcdd6340e 100755
--- a/configure
+++ b/configure
@@ -8525,6 +8525,7 @@ esac
 
 #-----------------------------------------------------------------------------
 crosstools_guess=yes
+aros_target_toolchain="no"
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Kernel toolchain prefix" >&5
 $as_echo_n "checking Kernel toolchain prefix... " >&6; }
@@ -8584,6 +8585,10 @@ if test "${crosstools}" = "yes"; then
     fi
 fi
 
+if test "${crosstools}" = "yes" || test "${crosstools_guess}" = "no"; then
+    aros_target_toolchain="yes"
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to install the crosstools binaries" >&5
 $as_echo_n "checking where to install the crosstools binaries... " >&6; }
 
@@ -10894,7 +10899,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking which target tools to use" >&5
 $as_echo_n "checking which target tools to use... " >&6; }
-if test "$crosstools" = "yes"; then
+if test "$aros_target_toolchain" = "yes"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $target_tool_prefix" >&5
 $as_echo "$target_tool_prefix" >&6; }
     # We are building AROS crosstools
@@ -14422,12 +14427,6 @@ if test "$use_kernel_cc_wrapper" = "yes" ; then
     aros_kernel_cc="${PWD}/${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-elf-gcc"
 fi
 
-if test "${crosstools}" = "yes" || test "${crosstools_guess}" = "no"; then
-    aros_target_toolchain=yes
-else
-    aros_target_toolchain=no
-fi
-
 
 # Generic
 
@@ -14689,13 +14688,11 @@ if test "${use_kernel_cc_wrapper}" = "yes"; then
 fi
 
 # Host compiler support scripts and spec
-if test "${crosstools}" = "no"; then
-    if test "${crosstools_guess}" = "no"; then
-        ac_config_commands="$ac_config_commands host-compiler-wrapper-support"
+if test "${aros_target_toolchain}" = "no"; then
+    ac_config_commands="$ac_config_commands host-compiler-wrapper-support"
 
-        ac_config_files="$ac_config_files ${aros_targetcfg_dir}/specs:config/specs.in ${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-aros-cpp:scripts/aros-cpp.in ${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-aros-gcc:scripts/aros-gcc.in ${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-aros-g++:scripts/aros-g++.in"
+    ac_config_files="$ac_config_files ${aros_targetcfg_dir}/specs:config/specs.in ${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-aros-cpp:scripts/aros-cpp.in ${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-aros-gcc:scripts/aros-gcc.in ${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-aros-g++:scripts/aros-g++.in"
 
-    fi
 fi
 
 # Android support
@@ -15420,11 +15417,11 @@ aros_tools_dir=${aros_tools_dir}
 
 
 
-                aros_host_exe_suffix=${aros_host_exe_suffix}
-                aros_tools_dir=${aros_tools_dir}
-                aros_target_cpu=${aros_target_cpu}
-                aros_target_arch=${aros_target_arch}
-                aros_target_suffix=${aros_target_suffix}
+            aros_host_exe_suffix=${aros_host_exe_suffix}
+            aros_tools_dir=${aros_tools_dir}
+            aros_target_cpu=${aros_target_cpu}
+            aros_target_arch=${aros_target_arch}
+            aros_target_suffix=${aros_target_suffix}
 
 
 
@@ -16035,12 +16032,12 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
             ln -sf $aros_kernel_ld$aros_host_exe_suffix         ${prefix2}-ld$aros_host_exe_suffix
          ;;
     "host-compiler-wrapper-support":C)
-                prefix=${PWD}/${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}
-                mkdir -p $prefix
-                prefix2=${PWD}/${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-aros
+            prefix=${PWD}/${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}
+            mkdir -p $prefix
+            prefix2=${PWD}/${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-aros
 
-                chmod a+x ${prefix2}-gcc ${prefix2}-g++ ${prefix2}-cpp
-             ;;
+            chmod a+x ${prefix2}-gcc ${prefix2}-g++ ${prefix2}-cpp
+         ;;
 
   esac
 done # for ac_tag
diff --git a/configure.in b/configure.in
index f4bc513136..c21f4aacc0 100644
--- a/configure.in
+++ b/configure.in
@@ -1503,6 +1503,7 @@ esac
 
 #-----------------------------------------------------------------------------
 crosstools_guess=yes
+aros_target_toolchain="no"
 
 AC_MSG_CHECKING([Kernel toolchain prefix])
 AC_ARG_WITH(kernel-toolchain-prefix,AC_HELP_STRING([--with-kernel-toolchain-prefix=...],[Specify crosscompile toolchain prefix for kernel objects]),[kernel_tool_prefix="$withval"])
@@ -1533,6 +1534,10 @@ if test "${crosstools}" = "yes"; then
     fi
 fi
 
+if test "${crosstools}" = "yes" || test "${crosstools_guess}" = "no"; then
+    aros_target_toolchain="yes"
+fi
+
 AC_MSG_CHECKING([where to install the crosstools binaries])
 AC_ARG_WITH(aros-toolchain-install,AC_HELP_STRING([--with-aros-toolchain-install=DIR],[Where to install or search for cross tools binaries]),[aros_toolchain_install=$withval])
 if test "x$aros_toolchain_install" = "x"; then
@@ -1839,7 +1844,7 @@ else
 fi
 
 AC_MSG_CHECKING([which target tools to use])
-if test "$crosstools" = "yes"; then
+if test "$aros_target_toolchain" = "yes"; then
     AC_MSG_RESULT([$target_tool_prefix])
     # We are building AROS crosstools
     tmp_tool_prefix="$AROS_CROSSTOOLSDIR/${target_tool_prefix}"
@@ -2573,12 +2578,6 @@ if test "$use_kernel_cc_wrapper" = "yes" ; then
     aros_kernel_cc="${PWD}/${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-elf-gcc"
 fi
 
-if test "${crosstools}" = "yes" || test "${crosstools_guess}" = "no"; then
-    aros_target_toolchain=yes
-else
-    aros_target_toolchain=no
-fi
-
 dnl --------------------------------------------------------------------
 dnl Configuration Output Section
 dnl --------------------------------------------------------------------
@@ -2905,31 +2904,29 @@ if test "${use_kernel_cc_wrapper}" = "yes"; then
 fi
 
 # Host compiler support scripts and spec
-if test "${crosstools}" = "no"; then
-    if test "${crosstools_guess}" = "no"; then
-        AC_CONFIG_COMMANDS([host-compiler-wrapper-support],
-            [
-                prefix=${PWD}/${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}
-                mkdir -p $prefix
-                prefix2=${PWD}/${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-aros
-
-                chmod a+x ${prefix2}-gcc ${prefix2}-g++ ${prefix2}-cpp
-            ],
-            [
-                aros_host_exe_suffix=${aros_host_exe_suffix}
-                aros_tools_dir=${aros_tools_dir}
-                aros_target_cpu=${aros_target_cpu}
-                aros_target_arch=${aros_target_arch}
-                aros_target_suffix=${aros_target_suffix}
-            ]
-        )
-        AC_CONFIG_FILES(
-            ${aros_targetcfg_dir}/specs:config/specs.in
-            ${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-aros-cpp:scripts/aros-cpp.in
-            ${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-aros-gcc:scripts/aros-gcc.in
-            ${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-aros-g++:scripts/aros-g++.in
-        )
-    fi
+if test "${aros_target_toolchain}" = "no"; then
+    AC_CONFIG_COMMANDS([host-compiler-wrapper-support],
+        [
+            prefix=${PWD}/${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}
+            mkdir -p $prefix
+            prefix2=${PWD}/${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-aros
+
+            chmod a+x ${prefix2}-gcc ${prefix2}-g++ ${prefix2}-cpp
+        ],
+        [
+            aros_host_exe_suffix=${aros_host_exe_suffix}
+            aros_tools_dir=${aros_tools_dir}
+            aros_target_cpu=${aros_target_cpu}
+            aros_target_arch=${aros_target_arch}
+            aros_target_suffix=${aros_target_suffix}
+        ]
+    )
+    AC_CONFIG_FILES(
+        ${aros_targetcfg_dir}/specs:config/specs.in
+        ${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-aros-cpp:scripts/aros-cpp.in
+        ${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-aros-gcc:scripts/aros-gcc.in
+        ${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-aros-g++:scripts/aros-g++.in
+    )
 fi
 
 # Android support
-- 
2.11.4.GIT