paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-13 14:49:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 44291

Browse Source 
------------------------------------------------------------------------
r44291 | pierre | 2020-03-12 10:53:56 +0000 (Thu, 12 Mar 2020) | 1 line

 Add explicit dependency of AVR specific unit avrsim on consoleio and heapmgr units
------------------------------------------------------------------------
--- Merging r44291 into '.':
C    rtl/embedded/Makefile (resolved by recomputing Makefile using fpcmake)
U    rtl/embedded/Makefile.fpc
--- Recording mergeinfo for merge of r44291 into '.':
 U   .

git-svn-id: branches/fixes_3_2@47823 -
This commit is contained in:
pierre 2020-12-20 11:27:04 +00:00
parent f3c1733daa
commit 918ca565f2
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/embedded/Makefile
View File

@ -2836,3 +2836,5 @@ fpcylix$(PPUEXT) : fpcylix.pp cthreads$(PPUEXT) cwstring$(PPUEXT) dynlibs$(PPUEX
$(COMPILER) fpcylix.pp
intrinsics$(PPUEXT) : $(PROCINC)/intrinsics.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(PROCINC)/intrinsics.pp
avrsim$(PPUEXT): $(ARCH)/avrsim.pp heapmgr$(PPUEXT) consoleio$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(ARCH)/avrsim.pp

5
rtl/embedded/Makefile.fpc
View File

@ -377,3 +377,8 @@ fpcylix$(PPUEXT) : fpcylix.pp cthreads$(PPUEXT) cwstring$(PPUEXT) dynlibs$(PPUEX
intrinsics$(PPUEXT) : $(PROCINC)/intrinsics.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(PROCINC)/intrinsics.pp
# AVR specific units
avrsim$(PPUEXT): $(ARCH)/avrsim.pp heapmgr$(PPUEXT) consoleio$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(ARCH)/avrsim.pp