paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 19:09:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed building of packages when cross-testing. Pass CROSSOPT to build packages in such case, otherwise options specified in TEST_OPT are used to build fpmake. The source compiler not always accepts target options. For example -Cfsoft option, often used for arm compiler, is not accepted by x86 compiler.

Browse Source 
git-svn-id: branches/targetandroid@23511 -
This commit is contained in:
yury 2013-01-24 10:29:01 +00:00
parent 8ae7c5784c
commit 86224e05f3
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/tstunits/Makefile
View File

@ -1723,11 +1723,15 @@ endif
.PHONY: cleanrtl distcleanrtl .PHONY: cleanrtl distcleanrtl
.PHONY: cleanfpcunit distcleanfpcunit .PHONY: cleanfpcunit distcleanfpcunit
.PHONY: cleanpackages distcleanpackages .PHONY: cleanpackages distcleanpackages
ifdef CROSSCOMPILE
override CROSSOPT:=$(OPT)
override OPT=
endif
DUMMYINSTALLDIR=$(BASEDIR)/tmp DUMMYINSTALLDIR=$(BASEDIR)/tmp
INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR) INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
rtl-stamp.$(FULL_TARGET): rtl-stamp.$(FULL_TARGET):
$(MAKE) -C ../../rtl all 'OPT=$(OPT) -n' $(MAKE) -C ../../rtl all 'OPT=$(OPT) -n' 'CROSSOPT=$(CROSSOPT)'
$(MAKE) -C ../../rtl install $(INSTALLOPT) $(MAKE) -C ../../rtl install $(INSTALLOPT) OPT= CROSSOPT=
$(ECHO) Compiled > rtl-stamp.$(FULL_TARGET) $(ECHO) Compiled > rtl-stamp.$(FULL_TARGET)
cleanrtl: cleanrtl:
$(DELTREE) $(COMPILER_TARGETDIR) $(DELTREE) $(COMPILER_TARGETDIR)
@ -1753,8 +1757,8 @@ DUMMYINSTALLDIR=$(BASEDIR)/tmp
INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR) INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
PACKAGESDIR=../../packages PACKAGESDIR=../../packages
packages-stamp.$(FULL_TARGET): packages-stamp.$(FULL_TARGET):
$(MAKE) -C ../../packages all 'OPT=$(OPT) -n' $(MAKE) -C ../../packages all 'OPT=$(OPT) -n' 'CROSSOPT=$(CROSSOPT)'
$(MAKE) -C ../../packages install $(INSTALLOPT) $(MAKE) -C ../../packages install $(INSTALLOPT) OPT= CROSSOPT=
$(ECHO) Compiled > packages-stamp.$(FULL_TARGET) $(ECHO) Compiled > packages-stamp.$(FULL_TARGET)
cleanpackages: cleanpackages:
$(DELTREE) $(COMPILER_TARGETDIR) $(DELTREE) $(COMPILER_TARGETDIR)

12
tests/tstunits/Makefile.fpc
View File

@ -23,6 +23,10 @@ fpcdir=../..
.PHONY: cleanfpcunit distcleanfpcunit .PHONY: cleanfpcunit distcleanfpcunit
.PHONY: cleanpackages distcleanpackages .PHONY: cleanpackages distcleanpackages
ifdef CROSSCOMPILE
override CROSSOPT:=$(OPT)
override OPT=
endif
############################# #############################
# RTL # RTL
@ -32,8 +36,8 @@ DUMMYINSTALLDIR=$(BASEDIR)/tmp
INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR) INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
rtl-stamp.$(FULL_TARGET): rtl-stamp.$(FULL_TARGET):
$(MAKE) -C ../../rtl all 'OPT=$(OPT) -n' $(MAKE) -C ../../rtl all 'OPT=$(OPT) -n' 'CROSSOPT=$(CROSSOPT)'
$(MAKE) -C ../../rtl install $(INSTALLOPT) $(MAKE) -C ../../rtl install $(INSTALLOPT) OPT= CROSSOPT=
$(ECHO) Compiled > rtl-stamp.$(FULL_TARGET) $(ECHO) Compiled > rtl-stamp.$(FULL_TARGET)
cleanrtl: cleanrtl:
@ -79,8 +83,8 @@ INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPIL
PACKAGESDIR=../../packages PACKAGESDIR=../../packages
packages-stamp.$(FULL_TARGET): packages-stamp.$(FULL_TARGET):
$(MAKE) -C ../../packages all 'OPT=$(OPT) -n' $(MAKE) -C ../../packages all 'OPT=$(OPT) -n' 'CROSSOPT=$(CROSSOPT)'
$(MAKE) -C ../../packages install $(INSTALLOPT) $(MAKE) -C ../../packages install $(INSTALLOPT) OPT= CROSSOPT=
$(ECHO) Compiled > packages-stamp.$(FULL_TARGET) $(ECHO) Compiled > packages-stamp.$(FULL_TARGET)
cleanpackages: cleanpackages: