Changeset 536 for trunk/src

Timestamp:

Sep 19, 2006, 6:44:57 AM (19 years ago)

Author:

bird

Message:

Fixed missing expansion in kbuild_lookup_variable.

File:

• trunk/src/gmake/kbuild.c (modified) (2 diffs)

trunk/src/gmake/kbuild.c

@@ -106 +106 @@
 }
 
+/**
+ * Converts the specified variable into a 'simple' one.
+ * @returns pVar.
+ * @param   pVar        The variable.
+ */
+static struct variable *
+kbuild_simplify_variable(struct variable *pVar)
+{
+    if (memchr(pVar->value, '$', pVar->value_length))
+    {
+        char *pszExpanded = allocated_variable_expand(pVar->value);
+        free(pVar->value);
+        pVar->value = pszExpanded;
+        pVar->value_length = strlen(pVar->value);
+        pVar->value_alloc_len = pVar->value_length + 1;
+    }
+    pVar->recursive = 0;
+}
 
 /**
@@ -131 +149 @@
         }
 #endif
+        /* Make sure the variable is simple, convert it if necessary. */
+        if (pVar->recursive)
+            kbuild_simplify_variable(pVar);
     }
     return pVar;