src/main/resources/make/configure.vm

changeset 179
ba9431028671
parent 178
c52a13d1e989
--- a/src/main/resources/make/configure.vm	Wed Dec 24 13:53:03 2025 +0100
+++ b/src/main/resources/make/configure.vm	Wed Dec 24 14:25:24 2025 +0100
@@ -86,7 +86,7 @@
 printhelp()
 {
     echo "Usage: $0 [OPTIONS]..."
-    if [ $has_config_vars__ -eq 1 ] ; then
+    if [ $has_overridable_config_vars__ -eq 1 ] ; then
         echo
         echo "Configuration:"
     fi
@@ -150,7 +150,7 @@
 touch "$TEMP_DIR/features"
 
 # config variables
-has_config_vars__=0
+has_overridable_config_vars__=0
 #foreach( $cfg in $config )
 if true \
 #if( $cfg.platform )
@@ -163,7 +163,9 @@
     :
     #foreach( $var in $cfg.vars )
     if [ -z "${D}${var.varName}__initialized__" ] ; then
-        has_config_vars__=1
+        #if( $var.overridable )
+        has_overridable_config_vars__=1
+        #end
         ${var.varName}__initialized__=1
         #if( $var.exec )
         ${var.varName}=`${var.value}`
@@ -309,15 +311,11 @@
 ## End of unparsed content **
 
 # generate vars.mk
-if [ ${D}has_config_vars__ -eq 1 ]; then
-    echo '# configuration' > "$TEMP_DIR/vars.mk"
-    #foreach( $var in $vars )
-    echo "${var.varName}=${D}${var.varName}" >> "$TEMP_DIR/vars.mk"
-    #end
-    echo >> "$TEMP_DIR/vars.mk"
-else
-    echo > "$TEMP_DIR/vars.mk"
-fi
+echo '# configuration' > "$TEMP_DIR/vars.mk"
+#foreach( $var in $vars )
+echo "${var.varName}=${D}${var.varName}" >> "$TEMP_DIR/vars.mk"
+#end
+echo >> "$TEMP_DIR/vars.mk"
 
 #
 # DEPENDENCIES
@@ -720,7 +718,7 @@
 if [ -n "$TOOLCHAIN_CSTD" ]; then
     echo "  default C std:  $TOOLCHAIN_CSTD"
 fi
-if [ ${D}has_config_vars__ -eq 1 ]; then
+if [ ${D}has_overridable_config_vars__ -eq 1 ]; then
     echo
     echo "Config:"
 #foreach( $var in $vars )

mercurial