diff options
| author | nickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-05-06 20:41:01 +0000 |
|---|---|---|
| committer | nickysn <nickysn@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-05-06 20:41:01 +0000 |
| commit | 47a7c7a04e283181834b2a757b3d703c1d8c2099 (patch) | |
| tree | 8f3ade940862f22e5f916e2a685d265abdbea3c0 /packages/numlib | |
| parent | 001d79d670c15795c63fbbb97eb38109c75ef534 (diff) | |
| download | fpc-47a7c7a04e283181834b2a757b3d703c1d8c2099.tar.gz | |
* 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
Diffstat (limited to 'packages/numlib')
| -rw-r--r-- | packages/numlib/Makefile | 7 | ||||
| -rw-r--r-- | packages/numlib/examples/Makefile | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/packages/numlib/Makefile b/packages/numlib/Makefile index d9e81a7d54..d180d564cc 100644 --- a/packages/numlib/Makefile +++ b/packages/numlib/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 diff --git a/packages/numlib/examples/Makefile b/packages/numlib/examples/Makefile index e4dde16134..ea1b837074 100644 --- a/packages/numlib/examples/Makefile +++ b/packages/numlib/examples/Makefile @@ -2355,6 +2355,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),) @@ -2366,7 +2367,7 @@ ifdef inUnix ifeq ($(OS_SOURCE),netbsd) OTHERLIBDIR:=/usr/pkg/lib endif -export GCCLIBDIR OTHERLIBDIR +export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR endif BATCHEXT=.bat LOADEREXT=.as @@ -3295,8 +3296,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 |