From 683d44e45583a686c3248b0452af55b62b47502e Mon Sep 17 00:00:00 2001 From: joost Date: Tue, 6 Oct 2015 22:15:45 +0000 Subject: [PATCH] --- Merging r31400 into '.': C packages/Makefile U packages/Makefile.fpc --- Recording mergeinfo for merge of r31400 into '.': U . Summary of conflicts: Text conflicts: 1 Summary of conflicts: Text conflicts: 1 # revisions: 31400 git-svn-id: branches/fixes_3_0@31971 - --- packages/Makefile | 5 ++--- packages/Makefile.fpc | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/Makefile b/packages/Makefile index b98df67fd3..3053bf49df 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -1652,11 +1652,10 @@ ifndef BUILDFULLNATIVE FPMAKE_OPT+=-sp endif .NOTPARALLEL: -fpmkunit_bootstrap: - $(MAKE) -C fpmkunit bootstrap fpmkunit_clean_bootstrap: $(MAKE) -C fpmkunit clean_bootstrap -fpmake$(SRCEXEEXT): fpmake.pp fpmkunit_bootstrap $(SUB_FPMAKE_SRCS) fpmake_add.inc fpmake_proc.inc +fpmake$(SRCEXEEXT): fpmake.pp $(SUB_FPMAKE_SRCS) fpmake_add.inc fpmake_proc.inc + $(MAKE) -C fpmkunit bootstrap $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) all: fpmake$(SRCEXEEXT) $(LOCALFPMAKE) compile $(FPMAKE_OPT) diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc index 14ee3d9071..3174426c81 100644 --- a/packages/Makefile.fpc +++ b/packages/Makefile.fpc @@ -68,11 +68,10 @@ FPMAKE_OPT+=-sp endif .NOTPARALLEL: -fpmkunit_bootstrap: - $(MAKE) -C fpmkunit bootstrap fpmkunit_clean_bootstrap: $(MAKE) -C fpmkunit clean_bootstrap -fpmake$(SRCEXEEXT): fpmake.pp fpmkunit_bootstrap $(SUB_FPMAKE_SRCS) fpmake_add.inc fpmake_proc.inc +fpmake$(SRCEXEEXT): fpmake.pp $(SUB_FPMAKE_SRCS) fpmake_add.inc fpmake_proc.inc + $(MAKE) -C fpmkunit bootstrap $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT) all: fpmake$(SRCEXEEXT) $(LOCALFPMAKE) compile $(FPMAKE_OPT)