diff --git a/Makefile b/Makefile index 453d8d2f8b..03b03cea6f 100644 --- a/Makefile +++ b/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),) diff --git a/Makefile.fpc b/Makefile.fpc index 93e4b406e0..c03a7dccc0 100644 --- a/Makefile.fpc +++ b/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