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 --- installer/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'installer') diff --git a/installer/Makefile b/installer/Makefile index 6c9e701bec..2b8a05d1a0 100644 --- a/installer/Makefile +++ b/installer/Makefile @@ -982,6 +982,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),) @@ -993,7 +994,7 @@ ifdef inUnix ifeq ($(OS_SOURCE),netbsd) OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIBDIR +export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as @@ -3605,8 +3606,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