From 5104869d925dc9e94f2c74ccd50c079c68afc612 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Wed, 27 Mar 2013 17:16:30 +0000 Subject: [PATCH] * let the character unit depend on buildcollations to prevent simultaneous building of unicodedata by two different units (overwriting each other's assembler/ppu output) git-svn-id: trunk@24024 - --- rtl/darwin/Makefile | 2 +- rtl/darwin/Makefile.fpc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile index 4389f7e547..c3e40d2748 100644 --- a/rtl/darwin/Makefile +++ b/rtl/darwin/Makefile @@ -2617,7 +2617,7 @@ classes$(PPUEXT) : sysutils$(PPUEXT) rtlconsts$(PPUEXT) types$(PPUEXT) typinfo$( $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp typinfo$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) rtlconsts$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp -character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas objpas$(PPUEXT) rtlconsts$(PPUEXT) +character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas objpas$(PPUEXT) rtlconsts$(PPUEXT) buildcollations$(PPUEXT) $(COMPILER) $(OBJPASDIR)/character.pas math$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT) $(COMPILER) $(OBJPASDIR)/math.pp diff --git a/rtl/darwin/Makefile.fpc b/rtl/darwin/Makefile.fpc index e38c8b7918..3c0dc47fe9 100644 --- a/rtl/darwin/Makefile.fpc +++ b/rtl/darwin/Makefile.fpc @@ -207,7 +207,8 @@ classes$(PPUEXT) : sysutils$(PPUEXT) rtlconsts$(PPUEXT) types$(PPUEXT) typinfo$( typinfo$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) rtlconsts$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp -character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas objpas$(PPUEXT) rtlconsts$(PPUEXT) +# let it depend on buildcollations to prevent simultaneous building of unicodedata +character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas objpas$(PPUEXT) rtlconsts$(PPUEXT) buildcollations$(PPUEXT) $(COMPILER) $(OBJPASDIR)/character.pas math$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT)