From 51f52565ceca349b1e7d3df535972f77dc021895 Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Fri, 31 May 2013 12:05:21 +0000
Subject: [PATCH]   * fixed cross-testing: test TESTCOMPILER variable before
 emptying OPT,     and assign (:=) rather than create a reference to (=) the
 original     OPT in TESTCOMPILER

git-svn-id: trunk@24662 -
---
 tests/tstunits/Makefile     | 16 ++++++++--------
 tests/tstunits/Makefile.fpc | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/tests/tstunits/Makefile b/tests/tstunits/Makefile
index 8179a75ba2..7ad12ae088 100644
--- a/tests/tstunits/Makefile
+++ b/tests/tstunits/Makefile
@@ -1758,6 +1758,14 @@ endif
 ifeq ($(OS_TARGET),msdos)
 override OPT=-CX
 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
 override CROSSOPT:=$(OPT)
 override OPT=
@@ -1803,14 +1811,6 @@ cleanpackages:
 	-$(DEL) packages-stamp.$(FULL_TARGET)
 distcleanpackages: cleanpackages
 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
 	$(TESTCOMPILER) erroru.pp
 ptest$(PPUEXT) : ../test/cg/ptest.pp
diff --git a/tests/tstunits/Makefile.fpc b/tests/tstunits/Makefile.fpc
index 3c521ce821..5a6b6503b3 100644
--- a/tests/tstunits/Makefile.fpc
+++ b/tests/tstunits/Makefile.fpc
@@ -27,6 +27,15 @@ ifeq ($(OS_TARGET),msdos)
 override OPT=-CX
 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
 override CROSSOPT:=$(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
         $(TESTCOMPILER) erroru.pp