Browse Source

Merge commit 44291
------------------------------------------------------------------------
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 -

pierre 4 years ago
parent
commit
918ca565f2
2 changed files with 7 additions and 0 deletions
  1. 2 0
      rtl/embedded/Makefile
  2. 5 0
      rtl/embedded/Makefile.fpc

+ 2 - 0
rtl/embedded/Makefile

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

+ 5 - 0
rtl/embedded/Makefile.fpc

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