Also recompile rtl using FPCFPMAKE before bootstrapping in fpmkunit directory (helps for cross-compilation)

git-svn-id: trunk@42550 -

packages/Makefile

@@ -1731,7 +1731,8 @@ endif
 fpmkunit_clean_bootstrap:
 	$(MAKE) -C fpmkunit clean_bootstrap
 fpmake$(SRCEXEEXT): fpmake.pp $(SUB_FPMAKE_SRCS) fpmake_add.inc fpmake_proc.inc
-	$(MAKE) -C fpmkunit bootstrap
+	$(MAKE) -C ../rtl all FPC=$(FPCFPMAKE)
+	$(MAKE) -C fpmkunit bootstrap FPC=$(FPCFPMAKE)
 	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT)
 all:	fpmake$(SRCEXEEXT)
 	$(LOCALFPMAKE) compile $(FPMAKE_OPT)

packages/Makefile.fpc

@@ -71,7 +71,8 @@ endif
 fpmkunit_clean_bootstrap:
 	$(MAKE) -C fpmkunit clean_bootstrap
 fpmake$(SRCEXEEXT): fpmake.pp $(SUB_FPMAKE_SRCS) fpmake_add.inc fpmake_proc.inc
-	$(MAKE) -C fpmkunit bootstrap
+	$(MAKE) -C ../rtl all FPC=$(FPCFPMAKE)
+	$(MAKE) -C fpmkunit bootstrap FPC=$(FPCFPMAKE)
 	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT)
 all:	fpmake$(SRCEXEEXT)
 	$(LOCALFPMAKE) compile $(FPMAKE_OPT)