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

* Replace -I by -Fi iun objpas rule

Browse Source 
* Correct fgl unit _DEPS variables
  * Set up rules for RTLCONSTSUNIT to handle both rtlconst and rtlconsts
This commit is contained in:
Pierre Muller 2023-08-04 10:18:15 +02:00
parent 401fcf6dfc
commit 7c7783a24a
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
rtl/inc/Makefile.rtl
View File

@ -435,7 +435,9 @@ PROFILEUNIT=profile
RASPI2UNIT=raspi2 RASPI2UNIT=raspi2
RASPI3UNIT=raspi3 RASPI3UNIT=raspi3
RASPIUARTUNIT=raspiuart RASPIUARTUNIT=raspiuart
RTLCONSTSUNIT=rtlconsts ifeq ($(RTLCONSTSUNIT),)
RTLCONSTSUNIT=rtlconsts
endif
SAM3X8EUNIT=sam3x8e SAM3X8EUNIT=sam3x8e
SAMD51P19AUNIT=samd51p19a SAMD51P19AUNIT=samd51p19a
SC32442BUNIT=sc32442b SC32442BUNIT=sc32442b
@ -662,8 +664,8 @@ OBJPAS_DEPS= $(OBJPASDIR)/objpas.pp $(INC)/except.inc \
$(SYSTEMUNIT)$(PPUEXT) \ $(SYSTEMUNIT)$(PPUEXT) \
$(OBJPAS_DEPS_OS) $(OBJPAS_DEPS_SPU) $(OBJPAS_DEPS_OS) $(OBJPAS_DEPS_SPU)
objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT): $(OBJPAS_DEPS)
$(COMPILER) $(OBJPAS_OPT) -I$(OBJPASDIR) $< $(COMPILER) $(OBJPAS_OPT) -Fi$(OBJPASDIR) $<
# macpas # macpas
@ -999,7 +1001,8 @@ System.Math$(PPUEXT): $(NSINC)/System.Math.pp $(MATH_DEPS)
FGL_DEPS=$(OBJPASDIR)/fgl.pp \ FGL_DEPS=$(OBJPASDIR)/fgl.pp \
objpas$(PPUEXT) $(TYPESUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(TYPESUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
$(SYSUTILSUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \
$(FCL_DEPS_OS) $(FCL_DEPS_CPU) $(RTLCONSTSUNIT)$(PPUEXT) \
$(FGL_DEPS_OS) $(FGL_DEPS_CPU)
fgl$(PPUEXT) : $(FGL_DEPS) fgl$(PPUEXT) : $(FGL_DEPS)
$(COMPILER) $(FGL_OPT) $< $(COMPILER) $(FGL_OPT) $<
@ -1034,18 +1037,26 @@ System.SysConst$(PPUEXT) : $(NSINC)/System.SysConst.pp $(SYSCONST_DEPS)
$(COMPILER) -Fi$(OBJPASDIR) $(SYSCONST_OPT) $< $(COMPILER) -Fi$(OBJPASDIR) $(SYSCONST_OPT) $<
# #
# RTLConst # RTLConsts (or RTLConst on some systems with LIMIT83fs)
# Let's only use RTLCONSTS_XX variables
# But RTLCONSTSUNIT can be either rtlconsts or rtlconst
# Thus we need to use the variable here
# #
ifdef FPC_DOTTEDUNITS
RTLCONSTS_DEPS=$(OBJPASDIR)/rtlconsts.pp \ RTLCONSTS_DEPS=$(OBJPASDIR)/rtlconsts.pp \
objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
$(RTLCONST_DEPS_OS) $(RTLCONST_DEPS_CPU) $(RTLCONSTS_DEPS_OS) $(RTLCONSTS_DEPS_CPU)
rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
$(COMPILER) $(RTLCONSTS_OPT) $<
System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS) System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $< $(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
else
RTLCONSTS_DEPS=$(OBJPASDIR)/$(RTLCONSTSUNIT).pp \
objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
$(RTLCONSTS_DEPS_OS) $(RTLCONSTS_DEPS_CPU)
$(RTLCONSTSUNIT)$(PPUEXT) : $(RTLCONSTS_DEPS)
$(COMPILER) $(RTLCONSTS_OPT) $<
endif
####################################### #######################################
# Other System-independent RTL Units # Other System-independent RTL Units