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

* pass feature switches only to the compiler when compiling the system unit, resolves #32809

Browse Source 
git-svn-id: trunk@37810 -
This commit is contained in:
florian 2017-12-25 21:54:51 +00:00
parent 82f452bb7c
commit a207dfbb6b
6 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rtl/android/jvm/Makefile
View File

@ -340,7 +340,6 @@ COMMON=$(RTL)/common
PROCINC=$(RTL)/$(CPU_TARGET) PROCINC=$(RTL)/$(CPU_TARGET)
UNITPREFIX=rtl UNITPREFIX=rtl
SYSTEMUNIT=system SYSTEMUNIT=system
override FPCOPT+=@rtl.cfg
ifdef RELEASE ifdef RELEASE
override FPCOPT+=-Ur override FPCOPT+=-Ur
endif endif
@ -2318,7 +2317,7 @@ include $(PROCINC)/makefile.cpu
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
$(SYSTEMUNIT)$(PPUEXT) : $(RTL)/java/$(SYSTEMUNIT).pp $(SYSDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(RTL)/java/$(SYSTEMUNIT).pp $(SYSDEPS)
$(COMPILER) -Us -Sg $(RTL)/java/$(SYSTEMUNIT).pp $(REDIR) $(COMPILER) -Us -Sg @rtl.cfg $(RTL)/java/$(SYSTEMUNIT).pp $(REDIR)
uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp
$(COMPILER) $(INC)/uuchar.pp $(COMPILER) $(INC)/uuchar.pp
objpas$(PPUEXT): $(RTL)/java/objpas.pp objpas$(PPUEXT): $(RTL)/java/objpas.pp

3
rtl/android/jvm/Makefile.fpc
View File

@ -32,7 +32,6 @@ COMMON=$(RTL)/common
PROCINC=$(RTL)/$(CPU_TARGET) PROCINC=$(RTL)/$(CPU_TARGET)
UNITPREFIX=rtl UNITPREFIX=rtl
SYSTEMUNIT=system SYSTEMUNIT=system
override FPCOPT+=@rtl.cfg
ifdef RELEASE ifdef RELEASE
override FPCOPT+=-Ur override FPCOPT+=-Ur
@ -78,7 +77,7 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
# #
$(SYSTEMUNIT)$(PPUEXT) : $(RTL)/java/$(SYSTEMUNIT).pp $(SYSDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(RTL)/java/$(SYSTEMUNIT).pp $(SYSDEPS)
$(COMPILER) -Us -Sg $(RTL)/java/$(SYSTEMUNIT).pp $(REDIR) $(COMPILER) -Us -Sg @rtl.cfg $(RTL)/java/$(SYSTEMUNIT).pp $(REDIR)
uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp
$(COMPILER) $(INC)/uuchar.pp $(COMPILER) $(INC)/uuchar.pp

3
rtl/gba/Makefile
View File

@ -342,7 +342,6 @@ PROCINC=$(RTL)/$(CPU_TARGET)
UNITPREFIX=rtl UNITPREFIX=rtl
SYSTEMUNIT=system SYSTEMUNIT=system
LOADERS=prt0 cprt0 LOADERS=prt0 cprt0
override FPCOPT+=@rtl.cfg
ifdef RELEASE ifdef RELEASE
override FPCOPT+=-Ur override FPCOPT+=-Ur
endif endif
@ -2846,7 +2845,7 @@ prt0$(OEXT) : prt0.as
cprt0$(OEXT) : cprt0.as cprt0$(OEXT) : cprt0.as
$(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)cprt0$(OEXT) cprt0.as $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)cprt0$(OEXT) cprt0.as
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(INC)/softfpu.pp $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(INC)/softfpu.pp
$(COMPILER) -Us -Sg $(SYSTEMUNIT).pp $(REDIR) $(COMPILER) -Us -Sg @rtl.cfg $(SYSTEMUNIT).pp $(REDIR)
uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp
$(COMPILER) $(INC)/uuchar.pp $(COMPILER) $(INC)/uuchar.pp
objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT)

3
rtl/gba/Makefile.fpc
View File

@ -48,7 +48,6 @@ PROCINC=$(RTL)/$(CPU_TARGET)
UNITPREFIX=rtl UNITPREFIX=rtl
SYSTEMUNIT=system SYSTEMUNIT=system
LOADERS=prt0 cprt0 LOADERS=prt0 cprt0
override FPCOPT+=@rtl.cfg
# Use new feature from 1.0.5 version # Use new feature from 1.0.5 version
# that generates release PPU files # that generates release PPU files
@ -93,7 +92,7 @@ cprt0$(OEXT) : cprt0.as
# #
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(INC)/softfpu.pp $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(INC)/softfpu.pp
$(COMPILER) -Us -Sg $(SYSTEMUNIT).pp $(REDIR) $(COMPILER) -Us -Sg @rtl.cfg $(SYSTEMUNIT).pp $(REDIR)
uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp
$(COMPILER) $(INC)/uuchar.pp $(COMPILER) $(INC)/uuchar.pp

3
rtl/java/Makefile
View File

@ -340,7 +340,6 @@ COMMON=$(RTL)/common
PROCINC=$(RTL)/$(CPU_TARGET) PROCINC=$(RTL)/$(CPU_TARGET)
UNITPREFIX=rtl UNITPREFIX=rtl
SYSTEMUNIT=system SYSTEMUNIT=system
override FPCOPT+=@rtl.cfg
ifdef RELEASE ifdef RELEASE
override FPCOPT+=-Ur override FPCOPT+=-Ur
endif endif
@ -2322,7 +2321,7 @@ include $(PROCINC)/makefile.cpu
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS)
$(COMPILER) -Us -Sg $(SYSTEMUNIT).pp $(REDIR) $(COMPILER) -Us -Sg @rtl.cfg $(SYSTEMUNIT).pp $(REDIR)
uuchar$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp uuchar$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp
$(COMPILER) $(INC)/uuchar.pp $(REDIR) $(COMPILER) $(INC)/uuchar.pp $(REDIR)
objpas$(PPUEXT) : objpas.pp objpas$(PPUEXT) : objpas.pp

3
rtl/java/Makefile.fpc
View File

@ -30,7 +30,6 @@ COMMON=$(RTL)/common
PROCINC=$(RTL)/$(CPU_TARGET) PROCINC=$(RTL)/$(CPU_TARGET)
UNITPREFIX=rtl UNITPREFIX=rtl
SYSTEMUNIT=system SYSTEMUNIT=system
override FPCOPT+=@rtl.cfg
ifdef RELEASE ifdef RELEASE
override FPCOPT+=-Ur override FPCOPT+=-Ur
@ -82,7 +81,7 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
# #
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS)
$(COMPILER) -Us -Sg $(SYSTEMUNIT).pp $(REDIR) $(COMPILER) -Us -Sg @rtl.cfg $(SYSTEMUNIT).pp $(REDIR)
uuchar$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp uuchar$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp
$(COMPILER) $(INC)/uuchar.pp $(REDIR) $(COMPILER) $(INC)/uuchar.pp $(REDIR)