ソースを参照

Add CROSSASTARGET and CROSSASPROG make variables.

 Pass CROSSASTARGET value to ASTARGET variable
when cross-compiling, do the same for CROSSASPROG and ASPROG.
 This allows to pass custom ASPROG (like vasm assembler)
without getting into trouble for 'singlezipinstall'
makefile target.
Pierre Muller 1 年間 前
コミット
4b49b084c5
2 ファイル変更16 行追加0 行削除
  1. 8 0
      Makefile
  2. 8 0
      Makefile.fpc

+ 8 - 0
Makefile

@@ -526,6 +526,14 @@ endif
 endif
 CLEANOPTS=FPC=$(PPNEW)
 BUILDOPTS=FPC=$(PPNEW) FPCFPMAKE=$(FPCFPMAKENEW) RELEASE=1 'OPT=$(OPTNEW)' 'FPCMAKEOPT=$(OPT)'
+ifdef CROSSCOMPILE
+ifneq ($(CROSSASPROG),)
+BUILDOPTS+=ASPROG=$(CROSSASPROG)
+endif
+ifneq ($(CROSSASTARGET),)
+BUILDOPTS+=ASTARGET=$(CROSSASTARGET)
+endif
+endif
 INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)
 BuildOnlyBaseCPUs=jvm
 ifneq ($(wildcard utils),)

+ 8 - 0
Makefile.fpc

@@ -220,6 +220,14 @@ endif
 
 CLEANOPTS=FPC=$(PPNEW)
 BUILDOPTS=FPC=$(PPNEW) FPCFPMAKE=$(FPCFPMAKENEW) RELEASE=1 'OPT=$(OPTNEW)' 'FPCMAKEOPT=$(OPT)'
+ifdef CROSSCOMPILE
+ifneq ($(CROSSASPROG),)
+BUILDOPTS+=ASPROG=$(CROSSASPROG)
+endif
+ifneq ($(CROSSASTARGET),)
+BUILDOPTS+=ASTARGET=$(CROSSASTARGET)
+endif
+endif
 INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)
 
 # CPU targets for which we only build the compiler/rtl