Changeset 3341 in kBuild for trunk

Timestamp:

May 20, 2020 2:33:15 PM (5 years ago)

Author:

bird

Message:

kDevObj: Ignore no-dependencies problems with object that doesn't contain data. This is needed for VCC 14.0 even when using -ZH:SHA_256. 14.1 and later only has this problem when not using the sha-256 option.

File:

• trunk/src/kmk/kmkbuiltin/kDepObj.c (modified) (3 diffs)

trunk/src/kmk/kmkbuiltin/kDepObj.c

@@ -772 +772 @@
     unsigned                            iSHdr;
     KPCUINT                             u;
+    KBOOL                               fDebugS    = K_FALSE;
     int                                 rcRet      = 2;
     int                                 rc;
@@ -806 +807 @@
             if (rcRet != 2)
                 return rc;
+            fDebugS = K_TRUE;
         }
         dprintf(("#%d: %.8s\n", iSHdr, paSHdrs[iSHdr].Name));
     }
+
+    /* If we found no dependencies but did find a .debug$S section, check if
+       this is a case where the compile didn't emit any because there is no
+       code in this compilation unit. */
+    if (rcRet == 2)
+    {
+        if (fDebugS)
+        {
+            for (iSHdr = 0; iSHdr < cSHdrs; iSHdr++)
+                if (!memcmp(paSHdrs[iSHdr].Name, ".text", sizeof(".text") - 1))
+                    return kDepErr(pThis, 2, "%s: no dependencies (has text).", pThis->pszFile);
+            warnx(pThis->pCtx, "%s: no dependencies, but also no text, so probably (mostly) harmless.", pThis->pszFile);
+            return 0;
+        }
+        kDepErr(pThis, 2, "%s: no dependencies.", pThis->pszFile);
+    }
+
     return rcRet;
 }
@@ -1163 +1182 @@
             if (!pInput)
                 return err(pCtx, 1, "Failed to open input file '%s'", argv[i]);
+            This.pszFile = argv[i];
             fInput = 1;
         }