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.

(cherry picked from commit 4b49b084c5e1579236ce697e0d758d6a12c56588)

Makefile

@@ -465,7 +465,15 @@ ifneq ($(OPT),)
 OPTNEW+=$(OPT)
 endif
 CLEANOPTS=FPC=$(PPNEW)
-BUILDOPTS=FPC=$(PPNEW) FPCFPMAKE=$(FPCFPMAKENEW) RELEASE=1 'OPT=$(OPTNEW)'
+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),)

Makefile.fpc

@@ -192,7 +192,15 @@ ifneq ($(OPT),)
 OPTNEW+=$(OPT)
 endif
 CLEANOPTS=FPC=$(PPNEW)
-BUILDOPTS=FPC=$(PPNEW) FPCFPMAKE=$(FPCFPMAKENEW) RELEASE=1 'OPT=$(OPTNEW)'
+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