Changeset 1128 for trunk/src/kmk

Timestamp:

Sep 27, 2007, 12:32:26 AM (18 years ago)

Author:

bird

Message:

OUTPUT_MAYBE support for compilers and assemblers.

File:

• trunk/src/kmk/kbuild.c (modified) (20 diffs)

trunk/src/kmk/kbuild.c

@@ -417 +417 @@
 }
 
+
 /**
  * Gets a variable that must exist and can be recursive.
@@ -447 +448 @@
 }
 
+
+/**
+ * Gets a variable that doesn't have to exit, but if it does can be recursive.
+ *
+ * @returns Pointer to the variable.
+ *          NULL if not found.
+ * @param   pszName     The variable name.
+ */
+static struct variable *
+kbuild_query_recursive_variable(const char *pszName)
+{
+#ifndef NDEBUG
+    unsigned i;
+#endif
+    struct variable *pVar = lookup_variable(pszName, strlen(pszName));
+    if (pVar)
+    {
+#ifndef NDEBUG
+        i = strlen(pVar->value);
+        if (i != pVar->value_length)
+        {
+            printf("%d != %d %s\n", pVar->value_length, i, pVar->name);
+# ifdef _MSC_VER
+            __debugbreak();
+# endif
+            assert(0);
+        }
+#endif
+    }
+    return pVar;
+}
+
+
 /**
  * Converts the specified variable into a 'simple' one.
@@ -466 +500 @@
     return pVar;
 }
+
 
 /**
@@ -498 +533 @@
 }
 
+
 /**
  * Looks up a variable and applies default a path to all relative paths.
@@ -515 +551 @@
 }
 
+
 /** Same as kbuild_lookup_variable except that a '%s' in the name string
- * will be substituted with the values of the variables in the va list.  */
+ * will be substituted with the values of the variables in the va list. */
 static struct variable *
 kbuild_lookup_variable_fmt_va(struct variable *pDefPath, const char *pszNameFmt, va_list va)
@@ -569 +606 @@
 }
 
+
 /** Same as kbuild_lookup_variable except that a '%s' in the name string
  * will be substituted with the values of the variables in the ellipsis.  */
@@ -581 +619 @@
     return pVar;
 }
+
 
 /**
@@ -654 +693 @@
     return NULL;
 }
+
 
 /*
@@ -693 +733 @@
 }
 
+
 /* Implements _SOURCE_TOOL. */
 char *
@@ -708 +749 @@
 
 }
+
 
 /* This has been extended a bit, it's now identical to _SOURCE_TOOL.
@@ -737 +779 @@
 }
 
+
 /*  */
 char *
@@ -872 +915 @@
 }
 
+
 /* Implements _OBJECT_BASE. */
 char *
@@ -900 +944 @@
     unsigned cTargetSource;
 };
+
 
 /* Fills in the SDK struct (remember to free it). */
@@ -1010 +1055 @@
 }
 
+
 /* releases resources allocated in the kbuild_get_sdks. */
 static void
@@ -1019 +1065 @@
     free(pSdks->pa);
 }
+
 
 /* this kind of stuff:
@@ -1395 +1442 @@
 }
 
+
 /* get a source property. Doesn't respect the default path. */
 char *
@@ -1434 +1482 @@
 }
 
+
 /*
 dep     := $(obj)$(SUFF_DEP)
@@ -1621 +1670 @@
     $(target)_$(source)_CMDS_   := $(TOOL_$(tool)_COMPILE_$(type)_CMDS)
     $(target)_$(source)_OUTPUT_ := $(TOOL_$(tool)_COMPILE_$(type)_OUTPUT)
+    $(target)_$(source)_OUTPUT_MAYBE_ := $(TOOL_$(tool)_COMPILE_$(type)_OUTPUT_MAYBE)
     $(target)_$(source)_DEPEND_ := $(TOOL_$(tool)_COMPILE_$(type)_DEPEND) $(deps) $(source)
     $(target)_$(source)_DEPORD_ := $(TOOL_$(tool)_COMPILE_$(type)_DEPORD) $(dirdep)
     */
-    cch = sizeof("TOOL_") + pTool->value_length + sizeof("_COMPILE_") + pType->value_length + sizeof("_OUTPUT");
+    cch = sizeof("TOOL_") + pTool->value_length + sizeof("_COMPILE_") + pType->value_length + sizeof("_OUTPUT_MAYBE");
     psz = pszSrcVar = alloca(cch);
     memcpy(psz, "TOOL_", sizeof("TOOL_") - 1);          psz += sizeof("TOOL_") - 1;
@@ -1632 +1682 @@
     pszSrc = psz;
 
-    cch = pTarget->value_length + 1 + pSource->value_length + sizeof("_OUTPUT_");
+    cch = pTarget->value_length + 1 + pSource->value_length + sizeof("_OUTPUT_MAYBE_");
     psz = pszDstVar = alloca(cch);
     memcpy(psz, pTarget->value, pTarget->value_length); psz += pTarget->value_length;
@@ -1648 +1698 @@
     pVar = kbuild_get_recursive_variable(pszSrcVar);
     pOutput = do_variable_definition(NILF, pszDstVar, pVar->value, o_file, f_simple, 0 /* !target_var */);
+
+    memcpy(pszSrc, "_OUTPUT_MAYBE", sizeof("_OUTPUT_MAYBE"));
+    memcpy(pszDst, "_OUTPUT_MAYBE_", sizeof("_OUTPUT_MAYBE_"));
+    pVar = kbuild_query_recursive_variable(pszSrcVar);
+    pOutput = do_variable_definition(NILF, pszDstVar, pVar ? pVar->value : "", o_file, f_simple, 0 /* !target_var */);
 
     memcpy(pszSrc, "_DEPEND", sizeof("_DEPEND"));