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

Merge commit 45737

Browse Source 
------------------------------------------------------------------------
r45737 | pierre | 2020-07-07 11:40:36 +0000 (Tue, 07 Jul 2020) | 1 line

 Use FPCOPT variable instead of OPT, to also pass BINUTILSPREFIX as -XP option for createlst and gparmake compilation
------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@45746 -
This commit is contained in:
pierre 2020-07-09 07:32:40 +00:00
parent 27723aa97d
commit 9ad32e036a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Makefile
View File

@ -2482,10 +2482,10 @@ else
MAKEINC=$(TEST_OUTPUTDIR)/MakeChunks-$(TEST_TARGETSUFFIX).inc MAKEINC=$(TEST_OUTPUTDIR)/MakeChunks-$(TEST_TARGETSUFFIX).inc
$(GPARMAKE): utils/gparmake.pp $(CREATELST) $(GPARMAKE): utils/gparmake.pp $(CREATELST)
$(Q)$(MAKE) $(COMPILER_UNITTARGETDIR) $(Q)$(MAKE) $(COMPILER_UNITTARGETDIR)
$(FPC) -FE. utils/gparmake.pp $(OPT) $(FPC) -FE. utils/gparmake.pp $(FPCOPT)
$(CREATELST): utils/createlst.pp $(CREATELST): utils/createlst.pp
$(Q)$(MAKE) $(COMPILER_UNITTARGETDIR) $(Q)$(MAKE) $(COMPILER_UNITTARGETDIR)
$(FPC) -FE. utils/createlst.pp $(OPT) $(FPC) -FE. utils/createlst.pp $(FPCOPT)
$(MAKEINC): $(GPARMAKE) $(CREATELST) $(MAKEINC): $(GPARMAKE) $(CREATELST)
$(Q)$(MAKE) $(TEST_OUTPUTDIR) $(Q)$(MAKE) $(TEST_OUTPUTDIR)
$(Q)$(CREATELST) filelisttest.lst $(TESTDIRS) $(Q)$(CREATELST) filelisttest.lst $(TESTDIRS)

4
tests/Makefile.fpc
View File

@ -506,11 +506,11 @@ MAKEINC=$(TEST_OUTPUTDIR)/MakeChunks-$(TEST_TARGETSUFFIX).inc
$(GPARMAKE): utils/gparmake.pp $(CREATELST) $(GPARMAKE): utils/gparmake.pp $(CREATELST)
$(Q)$(MAKE) $(COMPILER_UNITTARGETDIR) $(Q)$(MAKE) $(COMPILER_UNITTARGETDIR)
$(FPC) -FE. utils/gparmake.pp $(OPT) $(FPC) -FE. utils/gparmake.pp $(FPCOPT)
$(CREATELST): utils/createlst.pp $(CREATELST): utils/createlst.pp
$(Q)$(MAKE) $(COMPILER_UNITTARGETDIR) $(Q)$(MAKE) $(COMPILER_UNITTARGETDIR)
$(FPC) -FE. utils/createlst.pp $(OPT) $(FPC) -FE. utils/createlst.pp $(FPCOPT)
# Can't have testprep as prerequisite, because that is a phony target and # Can't have testprep as prerequisite, because that is a phony target and
# phony targets are always remade. Since the makefile will be reparsed # phony targets are always remade. Since the makefile will be reparsed