* don't export FPC_VERSION, the compiler version can be different

between the native and cross compiler
This commit is contained in:
peter 2004-05-16 10:22:45 +00:00
parent db9973de4b
commit 56d00c5aa2
2 changed files with 5 additions and 3 deletions

View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 1.1 [2004/04/21]
# Don't edit, this file is generated by FPCMake Version 1.1 [2004/05/16]
#
default: allexectests
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@ -1394,6 +1394,7 @@ makefiles: fpc_makefiles
ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc
endif
unexport FPC_VERSION
ifndef TEST_FPC
TEST_FPC=$(wildcard $(dir $(CURDIR))compiler/$(notdir $(FPC)))
ifeq ($(TEST_FPC), )
@ -1469,7 +1470,7 @@ copyfiles:
$(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)/ctest.o test/cg
$(COPY) test/units/system/test*.txt .
testprep: testprep-stamp.$(TEST_OS_TARGET)
testprep-stamp.$(TEST_OS_TARGET): utils units copyfiles FORCE
testprep-stamp.$(TEST_OS_TARGET): utils units copyfiles
$(ECHO) $(DATE) > testprep-stamp.$(TEST_OS_TARGET)
ifneq ($(TEST_FPC),ppc386$(EXEEXT))
ifeq ($(findstring -c$(TEST_FPC),$(DOTESTOPT)),)

View File

@ -10,6 +10,7 @@ fpcdir=..
rule=allexectests
[rules]
unexport FPC_VERSION
################################
# Test environment setup
@ -146,7 +147,7 @@ copyfiles:
#
testprep: testprep-stamp.$(TEST_OS_TARGET)
testprep-stamp.$(TEST_OS_TARGET): utils units copyfiles FORCE
testprep-stamp.$(TEST_OS_TARGET): utils units copyfiles
$(ECHO) $(DATE) > testprep-stamp.$(TEST_OS_TARGET)