diff options
| author | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-12-20 11:27:04 +0000 |
|---|---|---|
| committer | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-12-20 11:27:04 +0000 |
| commit | aa335299c23a2d6a3e36d45540773b1b1354b1d5 (patch) | |
| tree | 2a3f18a2d87ac916234009aa5aee24b96ab3b93b /rtl | |
| parent | b2ef15fa078f8d435cb7816887e52e3620f6bf06 (diff) | |
| download | fpc-aa335299c23a2d6a3e36d45540773b1b1354b1d5.tar.gz | |
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: https://svn.freepascal.org/svn/fpc/branches/fixes_3_2@47823 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'rtl')
| -rw-r--r-- | rtl/embedded/Makefile | 2 | ||||
| -rw-r--r-- | rtl/embedded/Makefile.fpc | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/rtl/embedded/Makefile b/rtl/embedded/Makefile index 02ac585c10..3e34714b2f 100644 --- a/rtl/embedded/Makefile +++ b/rtl/embedded/Makefile @@ -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 diff --git a/rtl/embedded/Makefile.fpc b/rtl/embedded/Makefile.fpc index 294cb6dd06..8855bfb886 100644 --- a/rtl/embedded/Makefile.fpc +++ b/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) $(COMPILER) $(PROCINC)/intrinsics.pp +# AVR specific units + +avrsim$(PPUEXT): $(ARCH)/avrsim.pp heapmgr$(PPUEXT) consoleio$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(ARCH)/avrsim.pp + |