From e0420b347fed96f82d369f3fe32d5638453ca6cd Mon Sep 17 00:00:00 2001
From: Rejean Loyer <rejean.loyer@gmail.com>
Date: Tue, 5 Mar 2013 15:22:04 -0500
Subject: [PATCH] ide; fixed error/warnings parsing when ld is skipping an
 incompatible library.

---
 ide/src/project/Project.ec | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/ide/src/project/Project.ec b/ide/src/project/Project.ec
index 72d3db7..a691412 100644
--- a/ide/src/project/Project.ec
+++ b/ide/src/project/Project.ec
@@ -1461,6 +1461,7 @@ private:
             //printf("Peeking and GetLine...\n");
             if((result = f.Peek()) && (result = f.GetLine(line, sizeof(line)-1)))
             {
+               char * message = null;
                char * inFileIncludedFrom = strstr(line, stringInFileIncludedFrom);
                test.copyLenSingleBlankReplTrim(line, ' ', true, testLen);
                if(strstr(line, compiler.makeCommand) == line && line[lenMakeCommand] == ':')
@@ -1586,8 +1587,13 @@ private:
                         GetLastDirectory(moduleName, temp);
                         if(linking && (!strcmp(temp, "ld") || !strcmp(temp, "ld.exe")))
                         {
-                           numErrors++;
-                           strcpy(moduleName, $"Linker Error");
+                           if(strstr(colon, "skipping incompatible"))
+                              message = $"Linker Message";
+                           else
+                           {
+                              numErrors++;
+                              message = $"Linker Error";
+                           }
                         }
                         else
                         {
@@ -1596,7 +1602,7 @@ private:
                            MakePathRelative(temp, topNode.path, moduleName);
                         }
                         if(strstr(line, "error:"))
-                           numErrors ++;
+                           numErrors++;
                         else
                         {
                            // Silence warnings for compiled EC
@@ -1611,7 +1617,7 @@ private:
                                  strncat(moduleName, colon, pointer - colon);
                                  strcat(moduleName, "error: ");
                                  colon = pointer;
-                                 numErrors ++;
+                                 numErrors++;
                               }
                            }
                            else if((pointer = strstr(line, "No such file")))
@@ -1619,7 +1625,7 @@ private:
                               strncat(moduleName, colon, pointer - colon);
                               strcat(moduleName, "error: ");
                               colon = pointer;
-                              numErrors ++;
+                              numErrors++;
                            }
                            else if(compilingEC == 1 || (objDir && objDir == moduleName))
                               continue;
@@ -1628,7 +1634,9 @@ private:
                               numWarnings++;
                            }
                         }
-                        if(this == ide.workspace.projects.firstIterator.data)
+                        if(message)
+                           ide.outputView.buildBox.Logf("   %s: %s\n", message, line);
+                        else if(this == ide.workspace.projects.firstIterator.data)
                            ide.outputView.buildBox.Logf("   %s%s\n", moduleName, colon);
                         else
                         {
-- 
1.8.3.1