zz_config/win-builds-switch: could try to match "native_toolchain..".

1 files changed, 10 insertions, 6 deletions

diff --git a/zz_config/win-builds-switch.in b/zz_config/win-builds-switch.in
index 44f3ebf..bf9601a 100644
--- a/zz_config/win-builds-switch.in
+++ b/zz_config/win-builds-switch.in
@@ -36,17 +36,21 @@ put_toolchain_in_path() {
   local BASE="${1}"
   local BITS="${2}"
 
-  local BASE2
+  local GLOB RE REPLACEMENT
   if [ -n "${BITS}" ]; then
-    BASE2="${BASE}_"
+    GLOB="${BASE}_??"
+    RE="${BASE}_.."
+    REPLACEMENT="${BASE}_${BITS}"
   else
-    BASE2="${BASE}"
+    GLOB="${BASE}"
+    RE="${BASE}"
+    REPLACEMENT="${BASE}"
   fi
 
   replace_in_path \
-    "/opt/${BASE2}??/bin" \
-    "/opt/${BASE2}../bin" \
-    "/opt/${BASE2}${BITS}/bin"
+    "/opt/${GLOB}/bin" \
+    "/opt/${RE}/bin" \
+    "/opt/${REPLACEMENT}/bin"
 }
 
 unset PKG_CONFIG_PATH