Changeset 3046 in kBuild

Timestamp:

May 15, 2017 12:15:05 PM (8 years ago)

Author:

bird

Message:

kbuild_lookup_variable_n: Don't simplify SDK_ReorderCompilerIncs_INCS variables, they must be expanded dynamically all the time to support different compilers.

File:

• trunk/src/kmk/kbuild.c (modified) (1 diff)

trunk/src/kmk/kbuild.c

@@ -613 +613 @@
                       ("%u != %u %.*s\n", pVar->value_length, (unsigned int)strlen(pVar->value), (int)cchName, pVar->name));
 
-        /* Make sure the variable is simple, convert it if necessary. */
-        if (pVar->recursive)
+        /* Make sure the variable is simple, convert it if necessary.
+           Note! Must NOT do this for the dynamic INCS of sdks/ReorderCompilerIncs.kmk */
+        if (!pVar->recursive)
+        { /* likely */ }
+        else if (   cchName < sizeof("SDK_ReorderCompilerIncs_INCS.") - 1U
+                 || pszName[0] != 'S'
+                 || pszName[4] != 'R'
+                 || memcmp(pszName, "SDK_ReorderCompilerIncs_INCS.", sizeof("SDK_ReorderCompilerIncs_INCS.") - 1U) == 0)
             kbuild_simplify_variable(pVar);
     }