Update Makefile's

Makefile

@@ -1071,31 +1071,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1104,16 +1107,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

compiler/Makefile

@@ -2863,31 +2863,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -2896,16 +2899,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32
@@ -4950,6 +4953,7 @@ endif
 PPC_TARGETS=i386 m68k powerpc sparc arm armeb x86_64 powerpc64 mips mipsel mips64 mips64el avr jvm i8086 aarch64 sparc64 riscv32 riscv64 xtensa z80 wasm32
 PPC_SUFFIXES=386 68k ppc sparc arm armeb x64 ppc64 mips mipsel mips64 mips64el avr jvm 8086 a64 sparc64 rv32 rv64 xtensa z80 wasm32
 INSTALL_TARGETS=$(addsuffix _exe_install,$(sort $(CYCLETARGETS) $(PPC_TARGETS)))
+CLEAN_TARGETS=$(addsuffix _clean,$(sort $(CYCLETARGETS) $(PPC_TARGETS)))
 SYMLINKINSTALL_TARGETS=$(addsuffix _symlink_install,$(sort $(CYCLETARGETS) $(PPC_TARGETS)))
 .PHONY: $(PPC_TARGETS) $(INSTALL_TARGETS)$(SYMLINKINSTALL_TARGETS)
 $(PPC_TARGETS):
@@ -4991,7 +4995,7 @@ execlean :
 	-$(DEL) $(addsuffix $(EXEEXT), $(addprefix ppcross, $(PPC_SUFFIXES)))
 	-$(DEL) $(EXENAME) $(TEMPWPONAME1) $(TEMPWPONAME2) $(ALL_G_COMPILERS)
 	-$(DEL) fpcmade.generate_g_compilers
-$(addsuffix _clean,$(ALLTARGETS)):
+$(CLEAN_TARGETS):
 	-$(DELTREE) $(addprefix $(subst _clean,,$@),/units)
 	-$(DELTREE) $(addprefix $(subst _clean,,$@),/bin)
 	-$(DEL) $(addprefix $(subst _clean,,$@)/,*$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT))

compiler/utils/Makefile

@@ -1877,31 +1877,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1910,16 +1913,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

installer/Makefile

@@ -1031,31 +1031,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1064,16 +1067,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/Makefile

@@ -610,31 +610,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -643,16 +646,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/a52/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/ami-extra/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/amunits/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/arosunits/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/aspell/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/bfd/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/bzip2/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/cairo/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/cdrom/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/cdrom/examples/Makefile

@@ -900,31 +900,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -933,16 +936,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/chm/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/cocoaint/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/dblib/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/dbus/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/dbus/examples/Makefile

@@ -900,31 +900,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -933,16 +936,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/dts/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fastcgi/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-async/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-base/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-base/examples/Makefile

@@ -900,31 +900,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -933,16 +936,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/base/Makefile

@@ -1875,31 +1875,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1908,16 +1911,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/codegen/Makefile

@@ -1550,31 +1550,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1583,16 +1586,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/datadict/Makefile

@@ -1550,31 +1550,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1583,16 +1586,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/dbase/Makefile

@@ -2206,31 +2206,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -2239,16 +2242,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/export/Makefile

@@ -1550,31 +1550,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1583,16 +1586,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/json/Makefile

@@ -902,31 +902,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -935,16 +938,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/memds/Makefile

@@ -1550,31 +1550,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1583,16 +1586,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/paradox/Makefile

@@ -1226,31 +1226,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1259,16 +1262,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/sdf/Makefile

@@ -1226,31 +1226,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1259,16 +1262,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/sql/Makefile

@@ -1874,31 +1874,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1907,16 +1910,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/sqldb/Makefile

@@ -1679,31 +1679,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1712,16 +1715,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/sqldb/interbase/Makefile

@@ -1226,31 +1226,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1259,16 +1262,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/sqldb/mssql/Makefile

@@ -1226,31 +1226,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1259,16 +1262,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/sqldb/mysql/Makefile

@@ -1550,31 +1550,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1583,16 +1586,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/sqldb/odbc/Makefile

@@ -1226,31 +1226,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1259,16 +1262,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/sqldb/oracle/Makefile

@@ -1550,31 +1550,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1583,16 +1586,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/sqldb/postgres/Makefile

@@ -1550,31 +1550,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1583,16 +1586,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/sqldb/sqlite/Makefile

@@ -1226,31 +1226,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1259,16 +1262,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/src/sqlite/Makefile

@@ -902,31 +902,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -935,16 +938,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-db/tests/Makefile

@@ -1226,31 +1226,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1259,16 +1262,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-extra/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-extra/examples/Makefile

@@ -699,31 +699,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -732,16 +735,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-fpcunit/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-fpcunit/src/exampletests/Makefile

@@ -1226,31 +1226,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1259,16 +1262,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-fpcunit/src/tests/Makefile

@@ -1226,31 +1226,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1259,16 +1262,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-hash/Makefile

@@ -610,31 +610,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -643,16 +646,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-image/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-image/examples/Makefile

@@ -900,31 +900,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -933,16 +936,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-js/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-json/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-mustache/Makefile

@@ -610,31 +610,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -643,16 +646,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-net/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-net/examples/Makefile

@@ -1548,31 +1548,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1581,16 +1584,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-passrc/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-pdf/Makefile

@@ -610,31 +610,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -643,16 +646,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-process/Makefile

@@ -610,31 +610,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -643,16 +646,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-registry/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-registry/tests/Makefile

@@ -902,31 +902,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -935,16 +938,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-report/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-res/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-sdo/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-sound/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-stl/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-web/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-web/src/base/Makefile

@@ -1551,31 +1551,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1584,16 +1587,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-web/src/jsonrpc/Makefile

@@ -1227,31 +1227,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1260,16 +1263,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-web/src/webdata/Makefile

@@ -1227,31 +1227,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1260,16 +1263,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fcl-xml/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fftw/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fpgtk/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fpgtk/examples/Makefile

@@ -1224,31 +1224,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1257,16 +1260,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fpindexer/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fpmkunit/Makefile

@@ -626,31 +626,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -659,16 +662,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fppkg/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fuse/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fv/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/fv/examples/Makefile

@@ -1223,31 +1223,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1256,16 +1259,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/gdbint/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/gdbm/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/gdbm/examples/Makefile

@@ -900,31 +900,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -933,16 +936,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/ggi/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/ggi/examples/Makefile

@@ -900,31 +900,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -933,16 +936,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/gitlab/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/gmp/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/gmp/examples/Makefile

@@ -900,31 +900,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -933,16 +936,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/gnome1/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/gnutls/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/googleapi/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/graph/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/gtk1/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/gtk1/examples/Makefile

@@ -1548,31 +1548,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1581,16 +1584,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/gtk1/examples/tutorial/Makefile

@@ -576,31 +576,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -609,16 +612,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/gtk1/src/gtkgl/Makefile

@@ -1228,31 +1228,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -1261,16 +1264,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32

packages/gtk2/Makefile

@@ -586,31 +586,34 @@ ifneq ($(filter sparc64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
+CROSSGCCOPT=-m32
+endif
+endif
+endif
 ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=64
 endif
-else
+endif
 ifneq ($(filter $(CPU_TARGET),mips mipsel),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-mabi=32
 endif
-else
+endif
 ifeq ($(BINUTILSPREFIX),)
+ifeq ($(GCCLIBDIR),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+endif
 else
+ifeq ($(CROSSGCCOPT),)
 CROSSGCCOPT=-m32
 endif
 endif
 endif
-endif
-endif
-endif
-endif
 ifdef FPCFPMAKE
 FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
 ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
@@ -619,16 +622,16 @@ else
 ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
 FPCMAKE_CROSSGCCOPT=-m64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)
 FPCMAKE_CROSSGCCOPT=-mabi=64
 else
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)
 FPCMAKE_CROSSGCCOPT=-mabi=lp64
 else
-ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)
+ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)
 FPCMAKE_CROSSGCCOPT=-mabi=ilp32
 else
 FPCMAKE_CROSSGCCOPT=-m32