diff options
Diffstat (limited to 'packages/fcl-process/Makefile')
| -rw-r--r-- | packages/fcl-process/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/fcl-process/Makefile b/packages/fcl-process/Makefile index 5f0718d102..1263a53bf4 100644 --- a/packages/fcl-process/Makefile +++ b/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 |