diff options
| author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2016-06-01 15:38:04 +0000 |
|---|---|---|
| committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2016-06-01 15:38:04 +0000 |
| commit | 621cf9fa05796e5fa1992c9dcdb92895e1ad6ae2 (patch) | |
| tree | d2524db23903dbadf119db22e04d34c278f32d40 | |
| parent | 116c7c0dd90cd8622fe8b619e927628c5b9fc9a4 (diff) | |
| download | fpc-621cf9fa05796e5fa1992c9dcdb92895e1ad6ae2.tar.gz | |
--- Merging r32354 into '.':
U rtl/msdos/Makefile.fpc
U rtl/msdos/Makefile
--- Recording mergeinfo for merge of r32354 into '.':
U .
# revisions: 32354
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@33870 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | rtl/msdos/Makefile | 2 | ||||
| -rw-r--r-- | rtl/msdos/Makefile.fpc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rtl/msdos/Makefile b/rtl/msdos/Makefile index f737225cfd..9d8572cf51 100644 --- a/rtl/msdos/Makefile +++ b/rtl/msdos/Makefile @@ -2756,7 +2756,7 @@ math$(PPUEXT): $(OBJPASDIR)/math.pp $(PROCINC)/mathu.inc objpas$(PPUEXT) sysutil typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp sysutils$(PPUEXT) objpas$(PPUEXT) rtlconst$(PPUEXT) system$(PPUEXT) $(COMPILER) -Sg -Fi$(OBJPASDIR) $(OBJPASDIR)/typinfo.pp $(EXECPPAS) -types$(PPUEXT) : $(OBJPASDIR)/types.pp objpas$(PPUEXT) system$(PPUEXT) +types$(PPUEXT) : $(OBJPASDIR)/types.pp objpas$(PPUEXT) math$(PPUEXT) system$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp $(EXECPPAS) rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp $(OBJPASDIR)/rtlconst.inc objpas$(PPUEXT) system$(PPUEXT) diff --git a/rtl/msdos/Makefile.fpc b/rtl/msdos/Makefile.fpc index 1f5e4ff568..6c62841c0b 100644 --- a/rtl/msdos/Makefile.fpc +++ b/rtl/msdos/Makefile.fpc @@ -142,7 +142,7 @@ typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp sysutils$(PPUEXT) objpas$(PPUEXT) rtlc $(COMPILER) -Sg -Fi$(OBJPASDIR) $(OBJPASDIR)/typinfo.pp $(EXECPPAS) -types$(PPUEXT) : $(OBJPASDIR)/types.pp objpas$(PPUEXT) system$(PPUEXT) +types$(PPUEXT) : $(OBJPASDIR)/types.pp objpas$(PPUEXT) math$(PPUEXT) system$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp $(EXECPPAS) |