summaryrefslogtreecommitdiff
path: root/packages/libogcfpc/examples/devices/network/sockettest/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'packages/libogcfpc/examples/devices/network/sockettest/Makefile')
-rw-r--r--packages/libogcfpc/examples/devices/network/sockettest/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/libogcfpc/examples/devices/network/sockettest/Makefile b/packages/libogcfpc/examples/devices/network/sockettest/Makefile
index 2cb122a4b9..c776ab8215 100644
--- a/packages/libogcfpc/examples/devices/network/sockettest/Makefile
+++ b/packages/libogcfpc/examples/devices/network/sockettest/Makefile
@@ -1768,6 +1768,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),)
@@ -1779,7 +1780,7 @@ ifdef inUnix
ifeq ($(OS_SOURCE),netbsd)
OTHERLIBDIR:=/usr/pkg/lib
endif
-export GCCLIBDIR OTHERLIBDIR
+export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
endif
BATCHEXT=.bat
LOADEREXT=.as
@@ -3530,8 +3531,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