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

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

Browse Source 
git-svn-id: trunk@45737 -
This commit is contained in:
pierre 2020-07-07 11:40:36 +00:00
parent 60c187e169
commit 604b9fd1fd
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/Makefile
View File

@ -2,7 +2,7 @@
# Don't edit, this file is generated by FPCMake Version 2.0.0 # Don't edit, this file is generated by FPCMake Version 2.0.0
# #
default: allexectests default: allexectests
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-win64 aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-win64 aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
BSDs = freebsd netbsd openbsd darwin dragonfly BSDs = freebsd netbsd openbsd darwin dragonfly
UNIXs = linux $(BSDs) solaris qnx haiku aix UNIXs = linux $(BSDs) solaris qnx haiku aix
LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@ -584,6 +584,9 @@ endif
ifeq ($(FULL_TARGET),mipsel-android) ifeq ($(FULL_TARGET),mipsel-android)
override TARGET_PROGRAMS+=gparmake createlst override TARGET_PROGRAMS+=gparmake createlst
endif endif
ifeq ($(FULL_TARGET),mips64el-linux)
override TARGET_PROGRAMS+=gparmake createlst
endif
ifeq ($(FULL_TARGET),jvm-java) ifeq ($(FULL_TARGET),jvm-java)
override TARGET_PROGRAMS+=gparmake createlst override TARGET_PROGRAMS+=gparmake createlst
endif endif
@ -1613,6 +1616,9 @@ endif
ifeq ($(FULL_TARGET),mipsel-android) ifeq ($(FULL_TARGET),mipsel-android)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
ifeq ($(FULL_TARGET),mips64el-linux)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),jvm-java) ifeq ($(FULL_TARGET),jvm-java)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
@ -2621,10 +2627,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

@ -514,11 +514,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