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 efb8523b0636bdb0c299999b1a3c2b572124d339..aec21cf7d5963f49af779a35e561175f88f5d6cf 100644 (file)
--- 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
 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 e2d5eadebcb09c32b715373aa1e94ab03e0b5668..acd3abcf2b1abdfe66d1dc72fb8cb066a2261633 100644 (file)
--- a/src/SDCCmain.c
+++ b/src/SDCCmain.c
@@ -2062,6 +2062,7 @@ static void
 setIncludePath(void)
 {
   char *p;
 setIncludePath(void)
 {
   char *p;

+  char *p2=NULL;

   set *tempSet=NULL;
 
   /*
   set *tempSet=NULL;
 
   /*


@@ -2086,7 +2087,17 @@ setIncludePath(void)
   mergeSets(&includeDirsSet, tempSet);
 
   if ((p = getenv(SDCC_INCLUDE_NAME)) != NULL)
   mergeSets(&includeDirsSet, tempSet);
 
   if ((p = getenv(SDCC_INCLUDE_NAME)) != NULL)

+  {

     addSetHead(&includeDirsSet, p);
     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) {
 
 #if 0
   if (options.printSearchDirs) {