summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2>2013-04-01 02:01:00 +0000
committernickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2>2013-04-01 02:01:00 +0000
commitf7e5ee2167bd0b7f9764d22fa90545ac37bc3a01 (patch)
treeabb69a95707109d3aa3cb0ab881fe4ae09dab91f
parentaf94f8a21691aba22071e1ba0bb882694435cda4 (diff)
downloadfpc-f7e5ee2167bd0b7f9764d22fa90545ac37bc3a01.tar.gz
* compile the RTL with -CX when running the testsuite for msdos
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/i8086@24102 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r--tests/tstunits/Makefile9
-rw-r--r--tests/tstunits/Makefile.fpc4
2 files changed, 12 insertions, 1 deletions
diff --git a/tests/tstunits/Makefile b/tests/tstunits/Makefile
index a2b7ab8694..cd0b76b8cd 100644
--- a/tests/tstunits/Makefile
+++ b/tests/tstunits/Makefile
@@ -1,5 +1,5 @@
#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/03/19]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/04/01]
#
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 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 arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android i8086-msdos
@@ -1137,6 +1137,10 @@ SHAREDLIBEXT=.jar
SHORTSUFFIX=android
endif
endif
+ifeq ($(OS_TARGET),msdos)
+STATICLIBEXT=.lib
+SHORTSUFFIX=d16
+endif
ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
FPCMADE=fpcmade.$(SHORTSUFFIX)
ZIPSUFFIX=$(SHORTSUFFIX)
@@ -1746,6 +1750,9 @@ endif
.PHONY: cleanrtl distcleanrtl
.PHONY: cleanfpcunit distcleanfpcunit
.PHONY: cleanpackages distcleanpackages
+ifeq ($(OS_TARGET),msdos)
+override OPT=-CX
+endif
ifdef CROSSCOMPILE
override CROSSOPT:=$(OPT)
override OPT=
diff --git a/tests/tstunits/Makefile.fpc b/tests/tstunits/Makefile.fpc
index fcd8494bbe..3c521ce821 100644
--- a/tests/tstunits/Makefile.fpc
+++ b/tests/tstunits/Makefile.fpc
@@ -23,6 +23,10 @@ fpcdir=../..
.PHONY: cleanfpcunit distcleanfpcunit
.PHONY: cleanpackages distcleanpackages
+ifeq ($(OS_TARGET),msdos)
+override OPT=-CX
+endif
+
ifdef CROSSCOMPILE
override CROSSOPT:=$(OPT)
override OPT=