Changeset 2020

Timestamp:

Nov 2, 2008, 1:52:34 AM (16 years ago)

Author:

bird

Message:

kbuild.c: $(target)_OBJS_ -> $(target)_2_OBJS. References #57.

File:

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

trunk/src/kmk/kbuild.c ¶

@@ -1949 +1949 @@
     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);
+    int fInstallOldVars = 0;
     char *pszDstVar, *pszDst, *pszSrcVar, *pszSrc, *pszVal, *psz;
     char *pszSavedVarBuf;
@@ -2061 +2062 @@
     */
     cch = sizeof("TOOL_") + pTool->value_length + sizeof("_COMPILE_") + pType->value_length + sizeof("_OUTPUT_MAYBE");
+    if (cch < pTarget->value_length + sizeof("$(_2_OBJS)"))
+        cch = pTarget->value_length + sizeof("$(_2_OBJS)");
     psz = pszSrcVar = alloca(cch);
     memcpy(psz, "TOOL_", sizeof("TOOL_") - 1);          psz += sizeof("TOOL_") - 1;
@@ -2132 +2135 @@
 
     /*
-    $(target)_OBJS_ += $(obj)
+    $(target)_2_OBJS += $(obj)
     */
-    memcpy(pszDstVar + pTarget->value_length, "_OBJS_", sizeof("_OBJS_"));
-    pVar = kbuild_query_recursive_variable_n(pszDstVar, pTarget->value_length + sizeof("_OBJS_") - 1);
+    memcpy(pszDstVar + pTarget->value_length, "_2_OBJS", sizeof("_2_OBJS"));
+    pVar = kbuild_query_recursive_variable_n(pszDstVar, pTarget->value_length + sizeof("_2_OBJS") - 1);
+    fInstallOldVars |= iVer <= 2 && (!pVar || !pVar->value_length);
     if (pVar)
     {
@@ -2143 +2147 @@
     }
     else
-        define_variable_vl_global(pszDstVar, pTarget->value_length + sizeof("_OBJS_") - 1,
+        define_variable_vl_global(pszDstVar, pTarget->value_length + sizeof("_2_OBJS") - 1,
                                   pObj->value, pObj->value_length,
                                   1 /* duplicate_value */,
@@ -2149 +2153 @@
                                   0 /* recursive */,
                                   NULL /* flocp */);
+
+    /*
+     * Install legacy variables.
+     */
+    if (fInstallOldVars)
+    {
+        /* $(target)_OBJS_ = $($(target)_2_OBJS)*/
+        memcpy(pszDstVar + pTarget->value_length, "_OBJS_", sizeof("_OBJS_"));
+
+        pszSrcVar[0] = '$';
+        pszSrcVar[1] = '(';
+        memcpy(pszSrcVar + 2, pTarget->value, pTarget->value_length);
+        psz = pszSrcVar + 2 + pTarget->value_length;
+        memcpy(psz, "_2_OBJS)", sizeof("_2_OBJS)"));
+
+        define_variable_vl_global(pszDstVar, pTarget->value_length + sizeof("_OBJS_") - 1,
+                                  pszSrcVar, pTarget->value_length + sizeof("$(_2_OBJS)") - 1,
+                                  1 /* duplicate_value */,
+                                  o_file,
+                                  1 /* recursive */,
+                                  NULL /* flocp */);
+    }
 
     /*