Changeset 1611 in kBuild

Timestamp:

May 9, 2008 1:23:23 AM (17 years ago)

Author:

bird

Message:

Fixed a cleanup problem where yasm and vcc* and stuch would leave additional output behind.

File:

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

trunk/src/kmk/kbuild.c

@@ -279 +279 @@
                 else
                   strcpy(pszTmp2, ".");
-    
+
                 if (!my_abspath(pszTmp2, szTmpPath))
                     fatal(NILF, _("failed to determin KBUILD_BIN_PATH (pszTmp2=%s szTmpPath=%s)"), pszTmp2, szTmpPath);
@@ -1686 +1686 @@
     struct variable *pOutBase   = kbuild_get_object_base(pTarget, pSource, "outbase");
     struct variable *pObjSuff   = kbuild_get_object_suffix(pTarget, pSource, pTool, pType, pBldTrg, pBldTrgArch, "objsuff");
-    struct variable *pDefs, *pIncs, *pFlags, *pDeps, *pOrderDeps, *pDirDep, *pDep, *pVar, *pOutput;
+    struct variable *pDefs, *pIncs, *pFlags, *pDeps, *pOrderDeps, *pDirDep, *pDep, *pVar, *pOutput, *pOutputMaybe;
     struct variable *pObj       = kbuild_set_object_name_and_dep_and_dirdep_and_PATH_target_source(pTarget, pSource, pOutBase, pObjSuff, "obj", &pDep, &pDirDep);
     char *pszDstVar, *pszDst, *pszSrcVar, *pszSrc, *pszVal, *psz;
@@ -1771 +1771 @@
     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 */);
+    pOutputMaybe = do_variable_definition(NILF, pszDstVar, pVar ? pVar->value : "", o_file, f_simple, 0 /* !target_var */);
 
     memcpy(pszSrc, "_DEPEND", sizeof("_DEPEND"));
@@ -1798 +1798 @@
 
     /*
-    _OUT_FILES      += $($(target)_$(source)_OUTPUT_)
+    _OUT_FILES      += $($(target)_$(source)_OUTPUT_) $($(target)_$(source)_OUTPUT_MAYBE_)
     */
     pVar = kbuild_get_variable("_OUT_FILES");
-    psz = pszVal = xmalloc(pVar->value_length + 1 + pOutput->value_length + 1);
+    psz = pszVal = xmalloc(pVar->value_length + 1 + pOutput->value_length + 1 + pOutputMaybe->value_length + 1);
     memcpy(psz, pVar->value, pVar->value_length); psz += pVar->value_length;
     *psz++ = ' ';
-    memcpy(psz, pOutput->value, pOutput->value_length + 1);
+    memcpy(psz, pOutput->value, pOutput->value_length); psz += pOutput->value_length;
+    *psz++ = ' ';
+    memcpy(psz, pOutputMaybe->value, pOutputMaybe->value_length + 1);
     do_variable_definition(NILF, "_OUT_FILES", pszVal, o_file, f_simple, 0 /* !target_var */);
     free(pszVal);