Merge commit 45737

------------------------------------------------------------------------
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 -

tests/Makefile

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

tests/Makefile.fpc

@@ -506,11 +506,11 @@ MAKEINC=$(TEST_OUTPUTDIR)/MakeChunks-$(TEST_TARGETSUFFIX).inc
 
 $(GPARMAKE): utils/gparmake.pp $(CREATELST)
 	$(Q)$(MAKE)  $(COMPILER_UNITTARGETDIR)
-	$(FPC) -FE. utils/gparmake.pp $(OPT)
+	$(FPC) -FE. utils/gparmake.pp $(FPCOPT)
 
 $(CREATELST): utils/createlst.pp
 	$(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
 # phony targets are always remade. Since the makefile will be reparsed