Changeset 644 for trunk/src

Timestamp:

Dec 3, 2006, 6:06:18 AM (19 years ago)

Author:

bird

Message:

Fixed bugs dealing with the order SDK properties was applied to sources.

File:

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

trunk/src/gmake/kbuild.c

@@ -806 +806 @@
     Prop.value_length = strlen(pszProp);
 
+    assert(iDirection == 1 || iDirection == -1);
+
     /*
      * Get the variables.
@@ -971 +973 @@
      */
     cchTotal = 0;
-    iVarEnd = iDirection > -1 ? cVars : 0;
-    for (iVar = iDirection > 0 ? 0 : cVars - 1; iVar != iVarEnd; iVar += iDirection)
+    iVarEnd = iDirection == 1 ? cVars : 0;
+    for (iVar = iDirection == 1 ? 0 : cVars - 1; iVar != iVarEnd; iVar += iDirection)
     {
         paVars[iVar].cchExp = 0;
@@ -995 +997 @@
      */
     psz = pszResult = xmalloc(cchTotal + 1);
-    iVarEnd = iDirection > -1 ? cVars : 0;
-    for (iVar = iDirection > 0 ? 0 : cVars - 1; iVar != iVarEnd; iVar += iDirection)
+    iVarEnd = iDirection == 1 ? cVars : 0;
+    for (iVar = iDirection == 1 ? 0 : cVars - 1; iVar != iVarEnd; iVar += iDirection)
     {
         if (!paVars[iVar].cchExp)
@@ -1034 +1036 @@
         iDirection = 1;
     else if (!strcmp(argv[2], "right-to-left"))
-        iDirection = 1;
+        iDirection = -1;
     else
         fatal(NILF, _("incorrect direction argument `%s'!"), argv[2]);
@@ -1196 +1198 @@
                                         "DEFS", "defs", 1/* left-to-right */);
     pIncs  = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu,
-                                        "INCS", "incs", 1/* right-to-left */);
+                                        "INCS", "incs", -1/* right-to-left */);
     pFlags = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu,
-                                        "FLAGS", "flags", 1/* right-to-left */);
+                                        "FLAGS", "flags", -1/* right-to-left */);
     pDeps  = kbuild_collect_source_prop(pTarget, pSource, pTool, &Sdks, pType, pBldType, pBldTrg, pBldTrgArch, pBldTrgCpu,
                                         "DEPS", "deps", 1/* left-to-right */);