* src/pic16/gen.c (genPcall,pic16_derefPtr,genGenPointerGet,

[fw/sdcc] / src / pic16 / main.c

diff --git a/src/pic16/main.c b/src/pic16/main.c
index 67c857909c90ce5e0edd3c37870873b4ea04332d..e630439c3bf6e4dd35f5bfda2b052ed6fbf4864e 100644 (file)
--- a/src/pic16/main.c
+++ b/src/pic16/main.c
@@ -639,6 +639,11 @@ extern set *linkOptionsSet;
 char *msprintf(hTab *pvals, const char *pformat, ...);
 int my_system(const char *cmd);
 
+/* forward declarations */   
+extern const char *pic16_linkCmd[];
+extern const char *pic16_asmCmd[];
+extern set *asmOptionsSet;
+  
 /* custom function to link objects */
 static void _pic16_linkEdit(void)
 {
@@ -655,9 +660,9 @@ static void _pic16_linkEdit(void)
         *
         */
         
-       sprintf(lfrm, "{linker} {incdirs} {lflags} -o {outfile} {user_ofile} {spec_ofiles} {ofiles} {libs}");
-                
-       shash_add(&linkValues, "linker", "gplink");
+       sprintf(lfrm, "{linker} {incdirs} {lflags} -o {outfile} {user_ofile} {ofiles} {spec_ofiles} {libs}");
+
+       shash_add(&linkValues, "linker", pic16_linkCmd[0]);
 
        mergeSets(&tSet, libDirsSet);
        mergeSets(&tSet, libPathsSet);
@@ -707,11 +712,6 @@ static void _pic16_linkEdit(void)
 }
 
 
-/* forward declarations */
-extern const char *pic16_linkCmd[];
-extern const char *pic16_asmCmd[];
-extern set *asmOptionsSet;
-
 static void
 _pic16_finaliseOptions (void)
 {