Răsfoiți Sursa

* fix for fpcmake running when crosscompiling. Now uses preinstalled fpcmake for package generation

marco 22 ani în urmă
părinte
comite
1f6833941d
2 a modificat fișierele cu 17 adăugiri și 3 ștergeri
  1. 9 2
      Makefile
  2. 8 1
      Makefile.fpc

+ 9 - 2
Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/04]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/06]
 #
 default: help
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@@ -302,7 +302,14 @@ ifndef DIST_DESTDIR
 export DIST_DESTDIR:=$(BASEDIR)
 endif
 BASEPACKDIR=$(BASEDIR)/basepack
-FPCMAKENEW=$(BASEDIR)/utils/fpcm/fpcmake$(EXEEXT)
+TEMPMAKENEW=$(BASEDIR)/utils/fpcm/fpcmake$(EXEEXT)
+ifneq ($(CPU_SOURCE),$(PPC_TARGET))
+TEMPMAKENEW=fpcmake
+endif
+ifneq ($(OS_SOURCE),$(OS_TARGET))
+TEMPMAKENEW=fpcmake
+endif
+FPCMAKENEW=$(TEMPMAKENEW)
 CLEANOPTS=FPC=$(PPNEW)
 BUILDOPTS=FPC=$(PPNEW) RELEASE=1
 INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)

+ 8 - 1
Makefile.fpc

@@ -138,7 +138,14 @@ endif
 BASEPACKDIR=$(BASEDIR)/basepack
 
 # Newly created fpcmake
-FPCMAKENEW=$(BASEDIR)/utils/fpcm/fpcmake$(EXEEXT)
+TEMPMAKENEW=$(BASEDIR)/utils/fpcm/fpcmake$(EXEEXT)
+ifneq ($(CPU_SOURCE),$(PPC_TARGET))
+TEMPMAKENEW=fpcmake
+endif
+ifneq ($(OS_SOURCE),$(OS_TARGET))
+TEMPMAKENEW=fpcmake
+endif
+FPCMAKENEW=$(TEMPMAKENEW)
 
 # Build/install options
 CLEANOPTS=FPC=$(PPNEW)