From: jesusc <jesusc@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Tue, 26 Apr 2005 17:13:25 +0000 (+0000)
Subject: src/SSDCCmain.c (setIncludePath): added port->target to SDCC_INCLUDE_NAME
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=4e94695808d88ba0140a815bacf14cd778beac7c;p=fw%2Fsdcc

src/SSDCCmain.c (setIncludePath): added port->target to SDCC_INCLUDE_NAME


git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@3743 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/ChangeLog b/ChangeLog
index efb8523b..aec21cf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-26 Jesus Calvino-Fraga <jesusc AT ece.ubc.ca>
+
+	* src/SDCCmain.c (setIncludePath): added port->target to SDCC_INCLUDE_NAME
+
 2005-04-26 Maarten Brock <sourceforge.brock AT dse.nl>
 
 	* support/regression/tests/bug1185672.c: added
diff --git a/src/SDCCmain.c b/src/SDCCmain.c
index e2d5eade..acd3abcf 100644
--- a/src/SDCCmain.c
+++ b/src/SDCCmain.c
@@ -2062,6 +2062,7 @@ static void
 setIncludePath(void)
 {
   char *p;
+  char *p2=NULL;
   set *tempSet=NULL;
 
   /*
@@ -2086,7 +2087,17 @@ setIncludePath(void)
   mergeSets(&includeDirsSet, tempSet);
 
   if ((p = getenv(SDCC_INCLUDE_NAME)) != NULL)
+  {
     addSetHead(&includeDirsSet, p);
+    p2=Safe_alloc(strlen(p)+strlen(DIR_SEPARATOR_STRING)+strlen(port->target)+1);
+    if(p2!=NULL)
+    {
+        strcpy(p2, p);
+        strcat(p2, DIR_SEPARATOR_STRING);
+        strcat(p2, port->target);
+        addSetHead(&includeDirsSet, p2);
+    }
+  }
 
 #if 0
   if (options.printSearchDirs) {