From 47a7c7a04e283181834b2a757b3d703c1d8c2099 Mon Sep 17 00:00:00 2001 From: nickysn Date: Wed, 6 May 2020 20:41:01 +0000 Subject: * fixed fpmake invokation when building an i386-linux snapshot on a x86_64-linux host git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@45298 3ad0048d-3df7-0310-abae-a5850022a9f2 --- packages/libndsfpc/examples/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'packages/libndsfpc/examples/Makefile') diff --git a/packages/libndsfpc/examples/Makefile b/packages/libndsfpc/examples/Makefile index b84a6a484f..53caa2b8b2 100644 --- a/packages/libndsfpc/examples/Makefile +++ b/packages/libndsfpc/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 -- cgit v1.2.1