* src/SDCCmain.c (linkEdit): oops, changed one line too many

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

diff --git a/ChangeLog b/ChangeLog
index e44e602a8f0d3481a15de15fb174c1be6efc6f82..26e0f95d4b116a4a5fd45268eb89f5a206ca5c95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-12 Maarten Brock <sourceforge.brock AT dse.nl>
+
+       * src/SDCCmain.c (linkEdit): oops, changed one line too many
+
 2005-04-11 Maarten Brock <sourceforge.brock AT dse.nl>
 
        * src/SDCCmain.c (linkEdit): fixed bug with finding crt0.o for z80

diff --git a/src/SDCCmain.c b/src/SDCCmain.c
index e1da3c49e031660f5919bfa2b843af118d8e4f35..e2d5eadebcb09c32b715373aa1e94ab03e0b5668 100644 (file)
--- a/src/SDCCmain.c
+++ b/src/SDCCmain.c
@@ -1677,7 +1677,7 @@ linkEdit (char **envp)
 
           tempSet = appendStrSet(libDirsSet, NULL, DIR_SEPARATOR_STRING);
           tempSet = appendStrSet(tempSet, NULL, c);
-          mergeSets(&tempSet, libDirsSet);
+          mergeSets(&tempSet, libPathsSet);
 
           for (s = setFirstItem(tempSet); s != NULL; s = setNextItem(tempSet))
             {