From: borutr Date: Fri, 13 May 2005 20:46:41 +0000 (+0000) Subject: * src/SDCCmain.c (linkEdit): fixed bug 1195202 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=21274f2a0c9745e384401c6398497b5abf65d8e4;p=fw%2Fsdcc * src/SDCCmain.c (linkEdit): fixed bug 1195202 git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@3755 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- diff --git a/ChangeLog b/ChangeLog index d98849be..126396f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-05-13 Borut Razem + + * src/SDCCmain.c (linkEdit): fixed bug 1195202 + 2005-05-12 Erik Petrich * .version: changed to version 2.5.1; back to bleeding edge development diff --git a/src/SDCCmain.c b/src/SDCCmain.c index acd3abcf..55338496 100644 --- a/src/SDCCmain.c +++ b/src/SDCCmain.c @@ -1425,6 +1425,7 @@ linkEdit (char **envp) char *segName, *c; int system_ret; const char *s; + char linkerScriptFileName[PATH_MAX]; if(port->linker.needLinkerScript) @@ -1447,11 +1448,11 @@ linkEdit (char **envp) } /* first we need to create the .lnk file */ - SNPRINTF (scratchFileName, sizeof(scratchFileName), + SNPRINTF (linkerScriptFileName, sizeof(scratchFileName), "%s.lnk", dstFileName); - if (!(lnkfile = fopen (scratchFileName, "w"))) + if (!(lnkfile = fopen (linkerScriptFileName, "w"))) { - werror (E_FILE_OPEN_ERR, scratchFileName); + werror (E_FILE_OPEN_ERR, linkerScriptFileName); exit (1); } @@ -1753,7 +1754,7 @@ linkEdit (char **envp) char buffer3[PATH_MAX]; set *tempSet=NULL, *libSet=NULL; - strcpy(buffer3, dstFileName); + strcpy(buffer3, linkerScriptFileName); if(TARGET_IS_PIC16) { /* use $l to set the linker include directories */