diff options
| author | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-10-06 22:15:45 +0000 |
|---|---|---|
| committer | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-10-06 22:15:45 +0000 |
| commit | f6faeac2374be8f4e716e0420e403ddb6eb6272d (patch) | |
| tree | 67145c3a153688446bc2b1e44fef63c8fc8052cd | |
| parent | b45d4a23d89f597d13fbfe61eab939b19d10037c (diff) | |
| download | fpc-f6faeac2374be8f4e716e0420e403ddb6eb6272d.tar.gz | |
--- 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: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@31971 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | packages/Makefile | 5 | ||||
| -rw-r--r-- | 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) |