Changeset 3056 in kBuild for trunk/src

Timestamp:

Sep 15, 2017 4:51:24 AM (8 years ago)

Author:

bird

Message:

redirect: Added trick for skipping fork+exec when dealing with nested kmk_[builtin]_redirect statements. This works around problems when generating tstAsmStructsHC.h using a VBOX_NM macro that already uses kmk_builtin_redirect.

File:

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

trunk/src/kmk/kmkbuiltin/redirect.c

@@ -1121 +1121 @@
             if (chOpt == '-')
             {
-                /* '--' indicates where the bits to execute start. */
+                /* '--' indicates where the bits to execute start.  Check if we're
+                   relaunching ourselves here and just continue parsing if we are. */
                 if (*pszArg == '\0')
                 {
                     iArg++;
-                    break;
+                    if (    iArg >= argc
+                        || (   strcmp(argv[iArg], "kmk_builtin_redirect") != 0
+                            && strcmp(argv[iArg], argv[0]) != 0))
+                        break;
+                    continue;
                 }