From fd94924a3d743c1c82f4b370d9401d7239172789 Mon Sep 17 00:00:00 2001 From: borutr Date: Mon, 13 Apr 2009 06:32:15 +0000 Subject: [PATCH] * device/lib/Makefile.in: remove abspath for PORTDIR, introduced in svn revision #5341, since it makes asranlib to fail on cygming and mingw builds: win32 native asranlib doesn't understand cygwin paths. git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5432 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 6 ++++++ device/lib/Makefile.in | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4626d029..b25e6f00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-04-13 Borut Razem + + * device/lib/Makefile.in: remove abspath for PORTDIR, introduced in + svn revision #5341, since it makes asranlib to fail on cygming and + mingw builds: win32 native asranlib doesn't understand cygwin paths. + 2009-04-10 Raphael Neider * device/lib/pic/libsdcc/fs2ulong.c, device/lib/pic/libsdcc/fsadd.c, diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in index 70b3a6dd..46b4d97e 100644 --- a/device/lib/Makefile.in +++ b/device/lib/Makefile.in @@ -8,7 +8,6 @@ VERSIONLO = @VERSIONLO@ VERSIONP = @VERSIONP@ SHELL = /bin/sh -CPP = @CPP@ INSTALL = @INSTALL@ CP = @CP@ @@ -55,7 +54,7 @@ BUILDDIR = build # Default PORT = z80 ifndef PORTDIR -PORTDIR = $(abspath $(BUILDDIR)/$(PORT)) +PORTDIR = $(BUILDDIR)/$(PORT) endif OPT_DISABLE_AVR = @OPT_DISABLE_AVR@ @@ -214,14 +213,14 @@ models: small-mcs51-stack-auto: if grep '^mcs51\>' $(top_builddir)/ports.build > /dev/null; then \ mkdir -p small-stack-auto; cp small/Makefile small-stack-auto; \ - $(MAKE) MODELFLAGS="--model-small --stack-auto" PORT=small-stack-auto PORTDIR=$(abspath $(BUILDDIR)/small-stack-auto) PORTINCDIR=$(INCDIR)/mcs51 objects; \ + $(MAKE) MODELFLAGS="--model-small --stack-auto" PORT=small-stack-auto PORTDIR=$(BUILDDIR)/small-stack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \ fi model-mcs51-stack-auto: if grep '^mcs51\>' $(top_builddir)/ports.build > /dev/null; then \ for model in $(MODELS); do \ mkdir -p $${model}-stack-auto; cp $${model}/Makefile $${model}-stack-auto; \ - $(MAKE) MODELFLAGS="--model-$$model --stack-auto" PORT=$${model}-stack-auto PORTDIR=$(abspath $(BUILDDIR)/$${model}-stack-auto) PORTINCDIR=$(INCDIR)/mcs51 objects; \ + $(MAKE) MODELFLAGS="--model-$$model --stack-auto" PORT=$${model}-stack-auto PORTDIR=$(BUILDDIR)/$${model}-stack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \ done \ fi @@ -229,7 +228,7 @@ model-mcs51-xstack-auto: if grep '^mcs51\>' $(top_builddir)/ports.build > /dev/null; then \ for model in $(MODELS); do \ mkdir -p $${model}-xstack-auto; cp $${model}/Makefile $${model}-xstack-auto; \ - $(MAKE) MODELFLAGS="--model-$$model --stack-auto --xstack -DUSE_FLOATS=1" PORT=$${model}-xstack-auto PORTDIR=$(abspath $(BUILDDIR)/$${model}-xstack-auto) PORTINCDIR=$(INCDIR)/mcs51 objects; \ + $(MAKE) MODELFLAGS="--model-$$model --stack-auto --xstack -DUSE_FLOATS=1" PORT=$${model}-xstack-auto PORTDIR=$(BUILDDIR)/$${model}-xstack-auto PORTINCDIR=$(INCDIR)/mcs51 objects; \ done \ fi -- 2.30.2