Browse Source

* .NOTPARALLEL target so cycle works with make -j for targets whose
rtl makefile has all dependencies properly defined (e.g. darwin)

git-svn-id: trunk@6216 -

Jonas Maebe 18 years ago
parent
commit
da942bdc58
4 changed files with 10 additions and 1 deletions
  1. 1 0
      compiler/Makefile
  2. 2 0
      compiler/Makefile.fpc
  3. 2 1
      compiler/utils/Makefile
  4. 5 0
      compiler/utils/Makefile.fpc

+ 1 - 0
compiler/Makefile

@@ -3041,6 +3041,7 @@ PPC_TARGETS=i386 m68k powerpc sparc arm x86_64 powerpc64 alpha vis ia64
 $(PPC_TARGETS):
 	$(MAKE) PPC_TARGET=$@ CPU_UNITDIR=$@ all
 alltargets: $(ALLTARGETS)
+.NOTPARALLEL:
 .PHONY: all compiler echotime ppuclean execlean clean distclean
 all: compiler $(addsuffix _all,$(TARGET_DIRS))
 compiler: $(COMPILER_UNITTARGETDIR) $(COMPILER_TARGETDIR) $(EXENAME)

+ 2 - 0
compiler/Makefile.fpc

@@ -283,6 +283,8 @@ alltargets: $(ALLTARGETS)
 # Default makefile
 #####################################################################
 
+.NOTPARALLEL:
+
 .PHONY: all compiler echotime ppuclean execlean clean distclean
 
 all: compiler $(addsuffix _all,$(TARGET_DIRS))

+ 2 - 1
compiler/utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/18]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/25]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
@@ -2291,6 +2291,7 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+.NOTPARALLEL:
 ppu$(PPUEXT): ppu.pas
 ppufiles$(EXEEXT): ppufiles.pp ppu$(PPUEXT)
 ppudump$(EXEEXT): ppudump.pp ppu$(PPUEXT)

+ 5 - 0
compiler/utils/Makefile.fpc

@@ -29,6 +29,11 @@ build=n
 #
 # PPU Tools
 #
+
+# not parallel because systems using an external linker will get conflicts
+# due to overwriting each other's link.res file
+.NOTPARALLEL:
+
 ppu$(PPUEXT): ppu.pas
 
 ppufiles$(EXEEXT): ppufiles.pp ppu$(PPUEXT)