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

--- Merging r31400 into '.':

Browse Source 
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 -
This commit is contained in:
joost 2015-10-06 22:15:45 +00:00
parent 6329336c32
commit 683d44e455
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/Makefile
View File

@ -1652,11 +1652,10 @@ ifndef BUILDFULLNATIVE
FPMAKE_OPT+=-sp FPMAKE_OPT+=-sp
endif endif
.NOTPARALLEL: .NOTPARALLEL:
fpmkunit_bootstrap:
$(MAKE) -C fpmkunit bootstrap
fpmkunit_clean_bootstrap: fpmkunit_clean_bootstrap:
$(MAKE) -C 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) $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT)
all: fpmake$(SRCEXEEXT) all: fpmake$(SRCEXEEXT)
$(LOCALFPMAKE) compile $(FPMAKE_OPT) $(LOCALFPMAKE) compile $(FPMAKE_OPT)

5
packages/Makefile.fpc
View File

@ -68,11 +68,10 @@ FPMAKE_OPT+=-sp
endif endif
.NOTPARALLEL: .NOTPARALLEL:
fpmkunit_bootstrap:
$(MAKE) -C fpmkunit bootstrap
fpmkunit_clean_bootstrap: fpmkunit_clean_bootstrap:
$(MAKE) -C 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) $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT)
all: fpmake$(SRCEXEEXT) all: fpmake$(SRCEXEEXT)
$(LOCALFPMAKE) compile $(FPMAKE_OPT) $(LOCALFPMAKE) compile $(FPMAKE_OPT)