From beca39448ab468ef23a53f81aba2540b6f4d5394 Mon Sep 17 00:00:00 2001 From: tom_at_work <tom_at_work@idefix.freepascal.org> Date: Fri, 21 Sep 2012 12:13:50 +0000 Subject: [PATCH] Forgot to add current compiler options to fpmkunit compilation. This leads to the error described in r22397 when e.g. building with -Cfvfpv3 on arm/linux git-svn-id: trunk@22429 - --- packages/fpmkunit/Makefile | 2 +- packages/fpmkunit/Makefile.fpc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fpmkunit/Makefile b/packages/fpmkunit/Makefile index 4c72242b3c..1931846763 100644 --- a/packages/fpmkunit/Makefile +++ b/packages/fpmkunit/Makefile @@ -2126,7 +2126,7 @@ endif $(TARGET_UNITDIRBS): $(MKDIRTREE) $(TARGET_UNITDIRBS) bootstrap: $(TARGET_UNITDIRBS) - $(FPCFPMAKE) src/fpmkunit.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -FU$(TARGET_UNITDIRBS) $(UNIT_ZIPPER) $(UNIT_PROCESS) + $(FPCFPMAKE) src/fpmkunit.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -FU$(TARGET_UNITDIRBS) $(UNIT_ZIPPER) $(UNIT_PROCESS) $(OPT) fpmake: fpmake.pp $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(UNITDIR_FPMAKE_RTL)) $(FPCMAKEOPT) -Fu$(TARGET_UNITDIRBS) $(OPT) all: fpmake diff --git a/packages/fpmkunit/Makefile.fpc b/packages/fpmkunit/Makefile.fpc index 7b543bcf73..91ddf2f95c 100644 --- a/packages/fpmkunit/Makefile.fpc +++ b/packages/fpmkunit/Makefile.fpc @@ -67,7 +67,7 @@ LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) $(TARGET_UNITDIRBS): $(MKDIRTREE) $(TARGET_UNITDIRBS) bootstrap: $(TARGET_UNITDIRBS) - $(FPCFPMAKE) src/fpmkunit.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -FU$(TARGET_UNITDIRBS) $(UNIT_ZIPPER) $(UNIT_PROCESS) + $(FPCFPMAKE) src/fpmkunit.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) -FU$(TARGET_UNITDIRBS) $(UNIT_ZIPPER) $(UNIT_PROCESS) $(OPT) fpmake: fpmake.pp $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(UNITDIR_FPMAKE_RTL)) $(FPCMAKEOPT) -Fu$(TARGET_UNITDIRBS) $(OPT) all: fpmake