Mercurial > hg > uwproj / file diff

--- a/src/main/resources/make/configure.vm	Sat Jan 20 14:56:50 2024 +0100
+++ b/src/main/resources/make/configure.vm	Sat Jan 20 15:37:16 2024 +0100
@@ -224,6 +224,26 @@
     done
     return 0
 }
+istoolchain()
+{
+    for t in $TOOLCHAIN
+    do
+        if [ "$t" = "$1" ]; then
+            return 0
+        fi
+    done
+    return 1
+}
+notistoolchain()
+{
+    for t in $TOOLCHAIN
+    do
+        if [ "$t" = "$1" ]; then
+            return 1
+        fi
+    done
+    return 0
+}
 ]]#
 ## End of unparsed content **
 
@@ -252,6 +272,7 @@
 
 # toolchain detection utilities
 . make/toolchain.sh
+TOOLCHAIN="${D}{TOOLCHAIN_NAME}"
 
 #
 # DEPENDENCIES
@@ -303,8 +324,13 @@
             break
         fi
         #end
+        #if( $sub.toolchain )
+        if notistoolchain "${sub.toolchain}"; then
+            break
+        fi
+        #end
         #foreach( $np in $sub.notList )
-        if isplatform "${np}"; then
+        if isplatform "${np}" || istoolchain "${np}"; then
             break
         fi
         #end
@@ -380,8 +406,13 @@
         break
     fi
     #end
+    #if( $dependency.toolchain )
+    if notistoolchain "${dependency.toolchain}"; then
+        break
+    fi
+    #end
     #foreach( $np in $dependency.notList )
-    if isplatform "${np}"; then
+    if isplatform "${np}" || istoolchain "${np}"; then
         break
     fi
     #end