paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-06-12 15:38:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

* proper fix for the passing of TEST_OPT to tstunits on msdos. The value of

Browse Source 
TEST_OPT was normally already passed in OPT, but on msdos the old value
  was killed, due to the 'override OPT=-CX'.

git-svn-id: trunk@26009 -
This commit is contained in:
nickysn 2013-11-10 14:36:06 +00:00
parent b4496c4aba
commit c666649320
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/tstunits/Makefile
View File

@ -1755,16 +1755,16 @@ endif
.PHONY: cleanrtl distcleanrtl .PHONY: cleanrtl distcleanrtl
.PHONY: cleanfpcunit distcleanfpcunit .PHONY: cleanfpcunit distcleanfpcunit
.PHONY: cleanpackages distcleanpackages .PHONY: cleanpackages distcleanpackages
ifeq ($(OS_TARGET),msdos) TESTOPT:=-n -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT)
override OPT=-CX
endif
TESTOPT:=-n $(TEST_OPT) -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT)
ifeq ($(CPU_TARGET),armeb) ifeq ($(CPU_TARGET),armeb)
override TESTOPT+=-Cb override TESTOPT+=-Cb
endif endif
ifneq ($(BINUTILSPREFIX),) ifneq ($(BINUTILSPREFIX),)
override TESTOPT+=-XP$(BINUTILSPREFIX) -Xc override TESTOPT+=-XP$(BINUTILSPREFIX) -Xc
endif endif
ifeq ($(OS_TARGET),msdos)
override TESTOPT+=-CX
endif
TESTCOMPILER:=$(FPC) $(TESTOPT) TESTCOMPILER:=$(FPC) $(TESTOPT)
ifdef CROSSCOMPILE ifdef CROSSCOMPILE
override CROSSOPT:=$(OPT) override CROSSOPT:=$(OPT)

8
tests/tstunits/Makefile.fpc
View File

@ -23,17 +23,17 @@ fpcdir=../..
.PHONY: cleanfpcunit distcleanfpcunit .PHONY: cleanfpcunit distcleanfpcunit
.PHONY: cleanpackages distcleanpackages .PHONY: cleanpackages distcleanpackages
ifeq ($(OS_TARGET),msdos)
override OPT=-CX
endif
TESTOPT:=-n $(TEST_OPT) -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT) TESTOPT:=-n -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT)
ifeq ($(CPU_TARGET),armeb) ifeq ($(CPU_TARGET),armeb)
override TESTOPT+=-Cb override TESTOPT+=-Cb
endif endif
ifneq ($(BINUTILSPREFIX),) ifneq ($(BINUTILSPREFIX),)
override TESTOPT+=-XP$(BINUTILSPREFIX) -Xc override TESTOPT+=-XP$(BINUTILSPREFIX) -Xc
endif endif
ifeq ($(OS_TARGET),msdos)
override TESTOPT+=-CX
endif
TESTCOMPILER:=$(FPC) $(TESTOPT) TESTCOMPILER:=$(FPC) $(TESTOPT)
ifdef CROSSCOMPILE ifdef CROSSCOMPILE