Changeset 542 in kBuild for trunk/src/gmake

Timestamp:

Sep 20, 2006 3:11:40 AM (18 years ago)

Author:

bird

Message:

a couple of fixes.

File:

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

trunk/src/gmake/kbuild.c

@@ -567 +567 @@
     pSdks->cTarget = 0;
     sprintf(pszTmp, "$(%s_SDKS) $(%s_SDKS.%s) $(%s_SDKS.%s) $(%s_SDKS.%s.%s)",
+            pTarget->value,
             pTarget->value, pBldType->value,
             pTarget->value, pBldTrg->value,
-            pTarget->value, pBldTrg->value,
-            pTarget->value, pBldTrgArch->value);
+            pTarget->value, pBldTrg->value, pBldTrgArch->value);
     pszIterator = pSdks->apsz[1] = allocated_variable_expand(pszTmp);
     while ((pszCur = find_next_token(&pszIterator, &cchCur)) != 0)
@@ -580 +580 @@
     pSdks->cSource = 0;
     sprintf(pszTmp, "$(%s_SDKS) $(%s_SDKS.%s) $(%s_SDKS.%s) $(%s_SDKS.%s.%s)",
+            pSource->value,
             pSource->value, pBldType->value,
             pSource->value, pBldTrg->value,
-            pSource->value, pBldTrg->value,
-            pSource->value, pBldTrgArch->value);
+            pSource->value, pBldTrg->value, pBldTrgArch->value);
     pszIterator = pSdks->apsz[2] = allocated_variable_expand(pszTmp);
     while ((pszCur = find_next_token(&pszIterator, &cchCur)) != 0)
@@ -593 +593 @@
     pSdks->cTargetSource = 0;
     sprintf(pszTmp, "$(%s_%s_SDKS) $(%s_%s_SDKS.%s) $(%s_%s_SDKS.%s) $(%s_%s_SDKS.%s.%s)",
+            pTarget->value, pSource->value, 
             pTarget->value, pSource->value, pBldType->value,
             pTarget->value, pSource->value, pBldTrg->value,
-            pTarget->value, pSource->value, pBldTrg->value,
-            pTarget->value, pSource->value, pBldTrgArch->value);
+            pTarget->value, pSource->value, pBldTrg->value, pBldTrgArch->value);
     pszIterator = pSdks->apsz[3] = allocated_variable_expand(pszTmp);
     while ((pszCur = find_next_token(&pszIterator, &cchCur)) != 0)
@@ -782 +782 @@
      * Get the variables.
      */
-    cVars = 12 + (pSdks->c + 1) * 12 * 4;
+    cVars = 12 /* the tool */
+          + 12 * pSdks->cGlobal /* global sdks */
+          + 12 /* the globals */
+          + 12 * pSdks->cTarget /* target sdks */
+          + 12 /* the target */
+          + 12 * pSdks->cSource /* source sdks */
+          + 12 /* the source */
+          + 12 * pSdks->cTargetSource /* target + source sdks */
+          + 12 /* the target + source */;
     paVars = alloca(cVars * sizeof(paVars[0]));
 
@@ -1062 +1070 @@
      */
     /* calc variable name. */
-    cch = pTarget->value_length + pSource->value_length + 7;
+    cch = sizeof("PATH_")-1 + pTarget->value_length + sizeof("_")-1 + pSource->value_length;
     psz = pszName = alloca(cch + 1);
     memcpy(psz, "PATH_", sizeof("PATH_") - 1);          psz += sizeof("PATH_") - 1;