diff options
Diffstat (limited to 'packages/users/Makefile')
| -rw-r--r-- | packages/users/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/users/Makefile b/packages/users/Makefile index cd2790ae0f..bd131603d6 100644 --- a/packages/users/Makefile +++ b/packages/users/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 |