diff -r bc7837852b7c -r 01ec9f32835e test/make/configure.vm --- a/test/make/configure.vm Fri Jan 19 21:23:56 2024 +0100 +++ b/test/make/configure.vm Sat Jan 20 14:56:50 2024 +0100 @@ -204,6 +204,8 @@ PLATFORM_NAME=`echo "$PLATFORM" | cut -f1 -d' ' -` echo "$PLATFORM_NAME" +TOOLCHAIN= + isplatform() { for p in $PLATFORM @@ -224,6 +226,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 ** @@ -265,6 +287,7 @@ lang_${lang}=1 fi #end +TOOLCHAIN=$TOOLCHAIN_NAME # create buffer for make variables required by dependencies echo > "$TEMP_DIR/make.mk" @@ -303,8 +326,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 +408,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