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

amiga and embedded Makefile.pfc changes

Browse Source 
Remove RESUNIT rule from amiga/Makefile.fpc, as fpintres and fpextres are both treated inside inc/Makefile.rtl
  Use CPU_COMMON_UNITS for embedded rules.
This commit is contained in:
Pierre Muller 2023-09-29 22:02:16 +02:00
parent ab4db7f475
commit 9a9e2e4ae5
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rtl/amiga/Makefile.fpc
View File

@ -94,6 +94,3 @@ endif
buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT) buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(CPU_TARGET) -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) $(BUILDRTL_OPT) buildrtl $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(CPU_TARGET) -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) $(BUILDRTL_OPT) buildrtl
$(RESUNIT)$(PPUEXT) : $(INC)/$(RESUNIT).pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -Sg $(INC)/$(RESUNIT).pp

15
rtl/embedded/Makefile.fpc
View File

@ -59,7 +59,7 @@ CPU_UNITS=
SYSINIT_UNITS= SYSINIT_UNITS=
CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) \ CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) \
$(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) \ $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) \
$(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) $(SOFTFPUUNIT)
# Sysutils special deps # Sysutils special deps
SYSUTILS_DEPS_OS=$(HEAPMGRUNIT)$(PPUEXT) SYSUTILS_DEPS_OS=$(HEAPMGRUNIT)$(PPUEXT)
@ -322,23 +322,19 @@ EmbeddedApi.HeapMGR$(PPUEXT) : $(NSOSDIR)/EmbeddedApi.HeapMGR.pp $(HEAPMGR_DEPS)
define CPU_UNITS_RULE define CPU_UNITS_RULE
ifndef FPC_DOTTEDUNITS ifndef FPC_DOTTEDUNITS
ifeq ($(ARCH),avr) $(1)$(PPUEXT): $(ARCH)/$(1).pp $(SYSTEMUNIT)$(PPUEXT) $(addsuffix $(PPUEXT),$(CPU_SPECIFIC_COMMON_UNITS))
$(1)$(PPUEXT): $(ARCH)/$(1).pp intrinsics$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
else
$(1)$(PPUEXT): $(ARCH)/$(1).pp $(SYSTEMUNIT)$(PPUEXT)
endif
else else
$(eval UNIT_REG_NAME=$(subst EmbeddedApi.,,$(1))) $(eval UNIT_REG_NAME=$(subst EmbeddedApi.,,$(1)))
$(eval UNIT_REG_NAME=$(subst ARMApi.,,$(UNIT_REG_NAME))) $(eval UNIT_REG_NAME=$(subst ARMApi.,,$(UNIT_REG_NAME)))
ifeq ($(ARCH),avr) ifeq ($(ARCH),avr)
# No dotted rules for AVR cpu yet # No dotted rules for AVR cpu yet
$(1)$(PPUEXT): $(ARCH)/$(1).pp intrinsics$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(1)$(PPUEXT): $(ARCH)/$(1).pp $(SYSTEMUNIT)$(PPUEXT) $(addsuffix $(PPUEXT),$(CPU_SPECIFIC_COMMON_UNITS))
else else
# mipsel is also not yet in namespaced # mipsel is also not yet in namespaced
ifeq ($(ARCH),mipsel) ifeq ($(ARCH),mipsel)
$(1)$(PPUEXT): $(ARCH)/$(1).pp $(SYSTEMUNIT)$(PPUEXT) $(1)$(PPUEXT): $(ARCH)/$(1).pp $(SYSTEMUNIT)$(PPUEXT) $(addsuffix $(PPUEXT),$(CPU_SPECIFIC_COMMON_UNITS))
else else
$(1)$(PPUEXT): $(NSOSDIR)/$(ARCH)/$(1).pp $(ARCH)/$(UNIT_REG_NAME).pp $(SYSTEMUNIT)$(PPUEXT) $(1)$(PPUEXT): $(NSOSDIR)/$(ARCH)/$(1).pp $(ARCH)/$(UNIT_REG_NAME).pp $(SYSTEMUNIT)$(PPUEXT) $(addsuffix $(PPUEXT),$(CPU_SPECIFIC_COMMON_UNITS))
endif endif
endif endif
endif endif
@ -352,7 +348,6 @@ else
$(addsuffix $(PPUEXT),$(CPU_UNITS)): $(addsuffix $(PPUEXT),$(CPU_UNITS)):
$(COMPILER) -g -Fi$(OSDIR) -Fi$(OSDIR)/$(ARCH) $< $(COMPILER) -g -Fi$(OSDIR) -Fi$(OSDIR)/$(ARCH) $<
endif endif
# AVR specific units # AVR specific units