paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-13 12:49:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed cross-testing: test TESTCOMPILER variable before emptying OPT,

Browse Source 
and assign (:=) rather than create a reference to (=) the original
    OPT in TESTCOMPILER

git-svn-id: trunk@24662 -
This commit is contained in:
Jonas Maebe 2013-05-31 12:05:21 +00:00
parent 5051453806
commit 51f52565ce
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/tstunits/Makefile
View File

@ -1758,6 +1758,14 @@ endif
ifeq ($(OS_TARGET),msdos) ifeq ($(OS_TARGET),msdos)
override OPT=-CX override OPT=-CX
endif endif
TESTOPT:=-n -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT)
ifeq ($(CPU_TARGET),armeb)
override TESTOPT+=-Cb
endif
ifneq ($(BINUTILSPREFIX),)
override TESTOPT+=-XP$(BINUTILSPREFIX) -Xc
endif
TESTCOMPILER:=$(FPC) $(TESTOPT)
ifdef CROSSCOMPILE ifdef CROSSCOMPILE
override CROSSOPT:=$(OPT) override CROSSOPT:=$(OPT)
override OPT= override OPT=
@ -1803,14 +1811,6 @@ cleanpackages:
-$(DEL) packages-stamp.$(FULL_TARGET) -$(DEL) packages-stamp.$(FULL_TARGET)
distcleanpackages: cleanpackages distcleanpackages: cleanpackages
packages : packages-stamp.$(FULL_TARGET) packages : packages-stamp.$(FULL_TARGET)
TESTOPT=-n -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT)
ifeq ($(CPU_TARGET),armeb)
override TESTOPT+=-Cb
endif
ifneq ($(BINUTILSPREFIX),)
override TESTOPT+=-XP$(BINUTILSPREFIX) -Xc
endif
TESTCOMPILER=$(FPC) $(TESTOPT)
erroru$(PPUEXT) : erroru.pp erroru$(PPUEXT) : erroru.pp
$(TESTCOMPILER) erroru.pp $(TESTCOMPILER) erroru.pp
ptest$(PPUEXT) : ../test/cg/ptest.pp ptest$(PPUEXT) : ../test/cg/ptest.pp

18
tests/tstunits/Makefile.fpc
View File

@ -27,6 +27,15 @@ ifeq ($(OS_TARGET),msdos)
override OPT=-CX override OPT=-CX
endif endif
TESTOPT:=-n -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT)
ifeq ($(CPU_TARGET),armeb)
override TESTOPT+=-Cb
endif
ifneq ($(BINUTILSPREFIX),)
override TESTOPT+=-XP$(BINUTILSPREFIX) -Xc
endif
TESTCOMPILER:=$(FPC) $(TESTOPT)
ifdef CROSSCOMPILE ifdef CROSSCOMPILE
override CROSSOPT:=$(OPT) override CROSSOPT:=$(OPT)
override OPT= override OPT=
@ -108,15 +117,6 @@ packages : packages-stamp.$(FULL_TARGET)
# #
TESTOPT=-n -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT)
ifeq ($(CPU_TARGET),armeb)
override TESTOPT+=-Cb
endif
ifneq ($(BINUTILSPREFIX),)
override TESTOPT+=-XP$(BINUTILSPREFIX) -Xc
endif
TESTCOMPILER=$(FPC) $(TESTOPT)
erroru$(PPUEXT) : erroru.pp erroru$(PPUEXT) : erroru.pp
$(TESTCOMPILER) erroru.pp $(TESTCOMPILER) erroru.pp