Pārlūkot izejas kodu

* do all make targets in parallel, no issues found yet

git-svn-id: trunk@44849 -
florian 5 gadi atpakaļ
vecāks
revīzija
5882e2935c
4 mainītis faili ar 12 papildinājumiem un 5 dzēšanām
  1. 6 1
      Makefile
  2. 0 2
      Makefile.fpc
  3. 6 1
      packages/Makefile
  4. 0 1
      packages/Makefile.fpc

+ 6 - 1
Makefile

@@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic
 endif
 override FPCOPT+=-Cp$(SUBARCH)
 endif
+ifeq ($(FULL_TARGET),xtensa-embedded)
+ifeq ($(SUBARCH),)
+$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined)
+endif
+override FPCOPT+=-Cp$(SUBARCH)
+endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 TARGETSUFFIX=$(OS_TARGET)
 SOURCESUFFIX=$(OS_SOURCE)
@@ -2901,7 +2907,6 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
-.NOTPARALLEL:
 unexport FPC_VERSION FPC_COMPILERINFO OS_SOURCE
 override TARGET_DIRS:=$(wildcard $(TARGET_DIRS))
 .PHONY: help

+ 0 - 2
Makefile.fpc

@@ -226,8 +226,6 @@ endif
 endif
 
 [rules]
-.NOTPARALLEL:
-
 # These values can change
 unexport FPC_VERSION FPC_COMPILERINFO OS_SOURCE
 

+ 6 - 1
packages/Makefile

@@ -196,6 +196,12 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic
 endif
 override FPCOPT+=-Cp$(SUBARCH)
 endif
+ifeq ($(FULL_TARGET),xtensa-embedded)
+ifeq ($(SUBARCH),)
+$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined)
+endif
+override FPCOPT+=-Cp$(SUBARCH)
+endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 TARGETSUFFIX=$(OS_TARGET)
 SOURCESUFFIX=$(OS_SOURCE)
@@ -1775,7 +1781,6 @@ endif
 ifdef LLVM
 FPMAKE_OPT+=--LLVM=1
 endif
-.NOTPARALLEL:
 fpmkunit_clean_bootstrap:
 	$(MAKE) -C fpmkunit clean_bootstrap
 fpmake$(SRCEXEEXT): fpmake.pp $(SUB_FPMAKE_SRCS) fpmake_add.inc fpmake_proc.inc

+ 0 - 1
packages/Makefile.fpc

@@ -72,7 +72,6 @@ endif
 ifdef LLVM
 FPMAKE_OPT+=--LLVM=1
 endif
-.NOTPARALLEL:
 
 fpmkunit_clean_bootstrap:
 	$(MAKE) -C fpmkunit clean_bootstrap