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

Unsert BUILDFULLNATIVE if CROSSCOMPILED is set

Browse Source 
git-svn-id: trunk@37218 -
This commit is contained in:
pierre 2017-09-15 20:22:56 +00:00
parent 893228deee
commit 311a6f7844
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/tstunits/Makefile
View File

@ -1,8 +1,8 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-08-12 rev 36877]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx 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-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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
BSDs = freebsd netbsd openbsd darwin dragonfly
UNIXs = linux $(BSDs) solaris qnx haiku aix
LIMIT83fs = go32v2 os2 emx watcom msdos win16
@ -406,9 +406,6 @@ endif
ifeq ($(FULL_TARGET),m68k-linux)
override CLEAN_UNITS+=erroru popuperr ptest
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
override CLEAN_UNITS+=erroru popuperr ptest
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
override CLEAN_UNITS+=erroru popuperr ptest
endif
@ -418,9 +415,6 @@ endif
ifeq ($(FULL_TARGET),m68k-atari)
override CLEAN_UNITS+=erroru popuperr ptest
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
override CLEAN_UNITS+=erroru popuperr ptest
endif
ifeq ($(FULL_TARGET),m68k-palmos)
override CLEAN_UNITS+=erroru popuperr ptest
endif
@ -665,9 +659,6 @@ endif
ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
endif
@ -677,9 +668,6 @@ endif
ifeq ($(FULL_TARGET),m68k-atari)
override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
endif
ifeq ($(FULL_TARGET),m68k-palmos)
override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
endif
@ -1909,6 +1897,7 @@ TESTCOMPILER:=$(FPC) $(TESTOPT)
ifdef CROSSCOMPILE
override CROSSOPT:=$(OPT)
override OPT=
override BUILDFULLNATIVE=
endif
DUMMYINSTALLDIR=$(BASEDIR)/tmp
INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)

1
tests/tstunits/Makefile.fpc
View File

@ -39,6 +39,7 @@ TESTCOMPILER:=$(FPC) $(TESTOPT)
ifdef CROSSCOMPILE
override CROSSOPT:=$(OPT)
override OPT=
override BUILDFULLNATIVE=
endif
#############################