buildsystem: swap setup_toolchain parameter

config/functions

@@ -269,7 +269,7 @@ setup_toolchain() {
   fi
 
   case "$1:$2" in
-    meson:target)
+    target:meson)
       export DESTIMAGE="target"
       export AWK="gawk"
       export CC="$TOOLCHAIN/bin/host-gcc"
@@ -308,7 +308,7 @@ setup_toolchain() {
       export _python_exec_prefix=/usr
       ;;
 
-    *:target|*:init)
+    target:*|init:*)
       export DESTIMAGE="target"
       export CC="${TARGET_PREFIX}gcc"
       export CXX="${TARGET_PREFIX}g++"
@@ -354,7 +354,7 @@ setup_toolchain() {
       export _python_prefix=/usr
       export _python_exec_prefix=/usr
       ;;
-    *:host|*:bootstrap)
+    host:*|bootstrap:*)
       export DESTIMAGE="host"
       export AWK="gawk"
       export CC="$TOOLCHAIN/bin/host-gcc"

scripts/build

@@ -112,7 +112,7 @@ fi
 build_msg "CLR_TOOLCHAIN" "TOOLCHAIN" "${PKG_TOOLCHAIN}${_auto_toolchain}"
 
 # setup toolchain
-setup_toolchain ${PKG_TOOLCHAIN} ${TARGET}
+setup_toolchain ${TARGET} ${PKG_TOOLCHAIN}
 
 # configure install directory
 if [ "${TARGET}" = "target" ]; then

scripts/build_mt

@@ -10,7 +10,7 @@ ${SCRIPTS}/checkdeps
 
 # Setup both toolchain cmake configs to avoid potentially racy behaviour later.
 # Use a fork for host to isolate any variable modifications.
-( setup_toolchain generic host )
-setup_toolchain generic target
+( setup_toolchain host )
+setup_toolchain target
 
 MTADDONBUILD=no start_multithread_build ${@}

scripts/create_addon

@@ -132,8 +132,8 @@ fi
 # check environment and configure toolchains
 ${SCRIPTS}/checkdeps
 
-( setup_toolchain generic host )
-setup_toolchain generic target
+( setup_toolchain host )
+setup_toolchain target
 
 # collect list of addons for building
 addons=

scripts/image

@@ -25,8 +25,8 @@ ${SCRIPTS}/checkdeps
 
 # Setup both toolchain cmake configs to avoid potentially racy behaviour later.
 # Use a fork for host to isolate any variable modifications.
-( setup_toolchain generic host )
-setup_toolchain generic target
+( setup_toolchain host )
+setup_toolchain target
 
 function do_mkimage() {
   # Variables used in mkimage script must be passed

scripts/install_addon

@@ -6,7 +6,7 @@
 . config/options "${1}"
 
 # Make sure we have a value for STRIP
-setup_toolchain generic target
+setup_toolchain target
 
 [ -n "${2}" ] && PKG_ADDON_ID=${2}