diff options
Diffstat (limited to 'packages/libndsfpc/examples/dswifi/autoconnect/Makefile')
-rw-r--r-- | packages/libndsfpc/examples/dswifi/autoconnect/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/libndsfpc/examples/dswifi/autoconnect/Makefile b/packages/libndsfpc/examples/dswifi/autoconnect/Makefile index fb813687b0..590a1152c4 100644 --- a/packages/libndsfpc/examples/dswifi/autoconnect/Makefile +++ b/packages/libndsfpc/examples/dswifi/autoconnect/Makefile @@ -2364,6 +2364,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),) @@ -2375,7 +2376,7 @@ ifdef inUnix ifeq ($(OS_SOURCE),netbsd) OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIBDIR +export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as @@ -4126,8 +4127,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 |