* fixed fpmake invokation when building an i386-linux snapshot on a x86_64-linux host

git-svn-id: trunk@45298 -

Makefile

@@ -1033,6 +1033,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1044,7 +1045,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -1637,8 +1638,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

compiler/Makefile

@@ -2651,6 +2651,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -2662,7 +2663,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3591,8 +3592,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

compiler/utils/Makefile

@@ -1765,6 +1765,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1776,7 +1777,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2705,8 +2706,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

installer/Makefile

@@ -982,6 +982,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -993,7 +994,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3605,8 +3606,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/Makefile

@@ -606,6 +606,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -617,7 +618,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -1546,8 +1547,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/a52/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/ami-extra/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/amunits/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/arosunits/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/aspell/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/bfd/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/bzip2/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/cairo/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/cdrom/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/cdrom/examples/Makefile

@@ -869,6 +869,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -880,7 +881,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2631,8 +2632,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/chm/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/cocoaint/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/dblib/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/dbus/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/dbus/examples/Makefile

@@ -869,6 +869,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -880,7 +881,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2631,8 +2632,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/dts/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fastcgi/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-async/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-base/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-base/examples/Makefile

@@ -869,6 +869,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -880,7 +881,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3727,8 +3728,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-db/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-db/src/base/Makefile

@@ -1763,6 +1763,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1774,7 +1775,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3662,8 +3663,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-db/src/codegen/Makefile

@@ -1465,6 +1465,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1476,7 +1477,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3227,8 +3228,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-db/src/datadict/Makefile

@@ -1465,6 +1465,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1476,7 +1477,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3824,8 +3825,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-db/src/dbase/Makefile

@@ -2067,6 +2067,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -2078,7 +2079,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3829,8 +3830,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-db/src/export/Makefile

@@ -1465,6 +1465,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1476,7 +1477,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3364,8 +3365,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-db/src/json/Makefile

@@ -871,6 +871,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -882,7 +883,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2770,8 +2771,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-db/src/memds/Makefile

@@ -1465,6 +1465,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1476,7 +1477,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3227,8 +3228,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-db/src/paradox/Makefile

@@ -1168,6 +1168,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1179,7 +1180,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3067,8 +3068,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-db/src/sdf/Makefile

@@ -1168,6 +1168,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1179,7 +1180,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2930,8 +2931,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-db/src/sql/Makefile

@@ -1762,6 +1762,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1773,7 +1774,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3524,8 +3525,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-db/src/sqldb/Makefile

@@ -1588,6 +1588,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1599,7 +1600,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3887,8 +3888,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

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

@@ -1168,6 +1168,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1179,7 +1180,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3067,8 +3068,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

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

@@ -1168,6 +1168,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1179,7 +1180,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2930,8 +2931,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

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

@@ -1465,6 +1465,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1476,7 +1477,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3364,8 +3365,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

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

@@ -1168,6 +1168,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1179,7 +1180,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3067,8 +3068,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

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

@@ -1465,6 +1465,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1476,7 +1477,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3364,8 +3365,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

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

@@ -1465,6 +1465,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1476,7 +1477,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3364,8 +3365,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

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

@@ -1168,6 +1168,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1179,7 +1180,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3067,8 +3068,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-db/src/sqlite/Makefile

@@ -871,6 +871,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -882,7 +883,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2770,8 +2771,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-db/tests/Makefile

@@ -1168,6 +1168,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1179,7 +1180,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3067,8 +3068,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-extra/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-extra/examples/Makefile

@@ -689,6 +689,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -700,7 +701,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2588,8 +2589,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-fpcunit/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-fpcunit/src/exampletests/Makefile

@@ -1168,6 +1168,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1179,7 +1180,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3204,8 +3205,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-fpcunit/src/tests/Makefile

@@ -1168,6 +1168,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1179,7 +1180,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3204,8 +3205,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-image/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-image/examples/Makefile

@@ -869,6 +869,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -880,7 +881,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2631,8 +2632,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-js/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-json/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-net/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-net/examples/Makefile

@@ -1463,6 +1463,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1474,7 +1475,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3499,8 +3500,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-passrc/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-pdf/Makefile

@@ -606,6 +606,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -617,7 +618,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2368,8 +2369,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-process/Makefile

@@ -606,6 +606,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -617,7 +618,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -1546,8 +1547,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-registry/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-registry/tests/Makefile

@@ -871,6 +871,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -882,7 +883,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -1811,8 +1812,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-report/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2618,8 +2619,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-res/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-sdo/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-sound/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-stl/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-web/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-web/src/base/Makefile

@@ -1466,6 +1466,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1477,7 +1478,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -4096,8 +4097,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-web/src/jsonrpc/Makefile

@@ -1169,6 +1169,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1180,7 +1181,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3205,8 +3206,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-web/src/webdata/Makefile

@@ -1169,6 +1169,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1180,7 +1181,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3342,8 +3343,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fcl-xml/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fftw/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fpgtk/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fpgtk/examples/Makefile

@@ -1166,6 +1166,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1177,7 +1178,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2928,8 +2929,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fpindexer/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fpmkunit/Makefile

@@ -625,6 +625,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -636,7 +637,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2113,8 +2114,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fppkg/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fuse/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fv/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/fv/examples/Makefile

@@ -1165,6 +1165,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1176,7 +1177,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2927,8 +2928,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/gdbint/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/gdbm/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/gdbm/examples/Makefile

@@ -869,6 +869,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -880,7 +881,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2631,8 +2632,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/ggi/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/ggi/examples/Makefile

@@ -869,6 +869,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -880,7 +881,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2631,8 +2632,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/gmp/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/gmp/examples/Makefile

@@ -869,6 +869,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -880,7 +881,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2631,8 +2632,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/gnome1/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/gnutls/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2344,8 +2345,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/googleapi/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/graph/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/gtk1/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/gtk1/examples/Makefile

@@ -1463,6 +1463,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1474,7 +1475,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -3225,8 +3226,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/gtk1/examples/tutorial/Makefile

@@ -572,6 +572,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -583,7 +584,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2334,8 +2335,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/gtk1/src/gtkgl/Makefile

@@ -1170,6 +1170,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -1181,7 +1182,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2932,8 +2933,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/gtk2/Makefile

@@ -582,6 +582,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -593,7 +594,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2207,8 +2208,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/gtk2/examples/Makefile

@@ -869,6 +869,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -880,7 +881,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2768,8 +2769,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/gtk2/examples/filechooser/Makefile

@@ -869,6 +869,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -880,7 +881,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2631,8 +2632,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif

packages/gtk2/examples/gettingstarted/Makefile

@@ -869,6 +869,7 @@ endif
 endif
 endif
 endif
+FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(CROSSGCC),)
@@ -880,7 +881,7 @@ ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR:=/usr/pkg/lib
 endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
 endif
 BATCHEXT=.bat
 LOADEREXT=.as
@@ -2631,8 +2632,12 @@ ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
 override FPCOPT+=-Fl$(GCCLIBDIR)
+ifdef FPCMAKEGCCLIBDIR
+override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
+else
 override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
 endif
+endif
 ifdef OTHERLIBDIR
 override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
 endif