From: tecodev Date: Sun, 24 Aug 2008 20:30:52 +0000 (+0000) Subject: * device/lib/pic16/configure, device/lib/pic16/configure.ac: X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=be3554776f3e99295e17a0232cb15c42cea80929;hp=c8772db13f85b9f595aa18cbe43e3bd2e77e5608;p=fw%2Fsdcc * device/lib/pic16/configure, device/lib/pic16/configure.ac: always use the sdcc from the current build tree (ignore $CC from the environment, fixes compile farm builds) * device/lib/Makefile.in: rename .a into .lib for compatibility, remove more build products from install directory * sdcc/src/pic16/main.c (_pic16_linkEdit,_pic16_finaliseOptions) * sdcc/support/scripts/sdcc.nsi: revert to .lib extension for libs git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5222 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- diff --git a/ChangeLog b/ChangeLog index d864dcc4..8c5b0358 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-08-24 Raphael Neider + + * device/lib/pic16/configure, device/lib/pic16/configure.ac: + always use the sdcc from the current build tree (ignore $CC from + the environment, fixes compile farm builds) + * device/lib/Makefile.in: rename .a into .lib for compatibility, + remove more build products from install directory + * sdcc/src/pic16/main.c (_pic16_linkEdit,_pic16_finaliseOptions) + * sdcc/support/scripts/sdcc.nsi: revert to .lib extension for libs + 2008-08-24 Borut Razem * src/SDCC.y: applied patch diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in index 235bd35b..fa743b6d 100644 --- a/device/lib/Makefile.in +++ b/device/lib/Makefile.in @@ -328,7 +328,7 @@ port-specific-objects: port-specific-objects-pic16: -if [ -f $(PORT)/Makefile ]; then \ $(MAKE) -C $(PORT); \ - cp -f $(PORT)/*/lib*.a $(PORTDIR); \ + for i in $(PORT)/*/lib*.a; do cp -f $$i $(PORTDIR)/$$(basename $$i .a).lib; done; \ cp -f $(PORT)/*/crt0*.o $(PORTDIR); \ fi @@ -363,15 +363,17 @@ install: all installdirs for src in $(MODELS) ds390 ds400 gbz80 z80 hc08 pic pic16; do \ find $(sdcc_libdir)/src/$$src -depth \ \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \ - -name '*.lst' -o -name '*.asm' -o -name '.svn' -o -name 'build' -o -name 'bin' -o \ - -name 'Makefile*' \) \ - -exec rm -rf {}+ \; ; \ + -name '*.lst' -o -name '*.asm' -o -name '.svn' -o -name 'autom4te.cache' -o \ + -name 'build' -o -name 'bin' -o -name 'Makefile*' -o -name 'config*' -o \ + -name 'depcomp' -o -name 'missing' -o -name 'install-sh' -o \ + -name 'bootstrap.sh' \) \ + -exec rm -rf {} + ; \ done find $(sdcc_libdir)/src/mcs51 -depth \ \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \ -name '*.lst' -o -name '.svn' -o -name 'build' -o -name 'bin' -o \ -name 'Makefile*' \) \ - -exec rm -rf {}+ \; + -exec rm -rf {} + # Deleting all the installed files # -------------------------------- diff --git a/device/lib/pic16/configure b/device/lib/pic16/configure index cc871d8f..7896b905 100755 --- a/device/lib/pic16/configure +++ b/device/lib/pic16/configure @@ -2181,11 +2181,11 @@ libdir=$libdir/pic16 # The default architecture can be selected at configure time by setting the # environment variable ARCH to the desired device (18fxxx). -ARCH=${ARCH-18f452} +ARCH=${ARCH:-18f452} # We cannot use AC_PROG_CC(sdcc) as sdcc might not be built at configure-time... -CC=${CC-$abs_top_builddir/../../../bin/sdcc} +CC=\"$abs_top_builddir/../../../bin/sdcc\" CFLAGS="-mpic16 -p$ARCH" diff --git a/device/lib/pic16/configure.ac b/device/lib/pic16/configure.ac index 30de488e..3e27ac1e 100644 --- a/device/lib/pic16/configure.ac +++ b/device/lib/pic16/configure.ac @@ -36,10 +36,10 @@ libdir=$libdir/pic16 # The default architecture can be selected at configure time by setting the # environment variable ARCH to the desired device (18fxxx). -AC_SUBST(ARCH, [${ARCH-18f452}]) +AC_SUBST(ARCH, [${ARCH:-18f452}]) # We cannot use AC_PROG_CC(sdcc) as sdcc might not be built at configure-time... -AC_SUBST(CC, [${CC-$abs_top_builddir/../../../bin/sdcc}]) +AC_SUBST(CC, [\"$abs_top_builddir/../../../bin/sdcc\"]) AC_SUBST(CFLAGS, ["-mpic16 -p$ARCH"]) AC_PATH_PROG(CCAS, gpasm, :) AC_SUBST(CCAS, [\"$CCAS\"]) diff --git a/src/pic16/main.c b/src/pic16/main.c index 246007b2..f396f9a2 100644 --- a/src/pic16/main.c +++ b/src/pic16/main.c @@ -695,18 +695,18 @@ static void _pic16_linkEdit(void) if(!libflags.ignore) { if(libflags.want_libc) - addSet(&libFilesSet, Safe_strdup("libc18f.a")); + addSet(&libFilesSet, Safe_strdup("libc18f.lib")); if(libflags.want_libm) - addSet(&libFilesSet, Safe_strdup("libm18f.a")); + addSet(&libFilesSet, Safe_strdup("libm18f.lib")); if(libflags.want_libio) { - sprintf(temp, "libio%s.a", pic16->name[1]); /* build libio18f452.a name */ + sprintf(temp, "libio%s.lib", pic16->name[1]); /* build libio18f452.lib name */ addSet(&libFilesSet, Safe_strdup(temp)); } if(libflags.want_libdebug) - addSet(&libFilesSet, Safe_strdup("libdebug.a")); + addSet(&libFilesSet, Safe_strdup("libdebug.lib")); } shash_add(&linkValues, "libs", joinStrSet(libFilesSet)); @@ -753,11 +753,11 @@ _pic16_finaliseOptions (void) char devlib[512]; /* now add the library for the device */ - sprintf(devlib, "libdev%s.a", pic16->name[1]); /* e.g., libdev18f452.a */ + sprintf(devlib, "libdev%s.lib", pic16->name[1]); /* e.g., libdev18f452.lib */ addSet(&libFilesSet, Safe_strdup(devlib)); /* add the internal SDCC library */ - addSet(&libFilesSet, Safe_strdup( "libsdcc.a" )); + addSet(&libFilesSet, Safe_strdup( "libsdcc.lib" )); } if (alt_asm && alt_asm[0] != '\0') diff --git a/support/scripts/sdcc.nsi b/support/scripts/sdcc.nsi index 7f05acb6..de51aa13 100644 --- a/support/scripts/sdcc.nsi +++ b/support/scripts/sdcc.nsi @@ -500,7 +500,7 @@ ${Section} "SDCC PIC16 library" SEC15 SectionIn 1 2 SetOutPath "$INSTDIR\lib\pic16" File "${DEV_ROOT}\lib\pic16\*.o" - File "${DEV_ROOT}\lib\pic16\*.a" + File "${DEV_ROOT}\lib\pic16\*.lib" ${SectionEnd} ${Section} "SDCC PIC library" SEC16 @@ -849,7 +849,7 @@ ${Section} Uninstall SECUNINSTALL Delete "$INSTDIR\lib\pic\*.lib" Delete "$INSTDIR\lib\pic16\*.o" - Delete "$INSTDIR\lib\pic16\*.a" + Delete "$INSTDIR\lib\pic16\*.lib" Delete "$INSTDIR\lib\hc08\*.rel" Delete "$INSTDIR\lib\hc08\*.lib"