diff options
| author | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-05-13 13:53:15 +0000 |
|---|---|---|
| committer | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-05-13 13:53:15 +0000 |
| commit | 4f0622a80c3c2bf8f3c3c400f972b90841717c43 (patch) | |
| tree | ac6fa2dec1ffa44063fa9c7856a51c7d44458143 /packages/numlib | |
| parent | 9e0b2e34ffbf83eef39a76bb0bc35966fb743eda (diff) | |
| download | fpc-4f0622a80c3c2bf8f3c3c400f972b90841717c43.tar.gz | |
Regenerate all Makefile's after change in utils/fpcm/fpcmake.ini to better support use of i386 compiler on x86_64 machines
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@45356 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/numlib')
| -rw-r--r-- | packages/numlib/Makefile | 8 | ||||
| -rw-r--r-- | packages/numlib/examples/Makefile | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/packages/numlib/Makefile b/packages/numlib/Makefile index d180d564cc..fbb9f77355 100644 --- a/packages/numlib/Makefile +++ b/packages/numlib/Makefile @@ -582,7 +582,15 @@ endif endif endif endif +ifdef FPCFPMAKE +FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP) +ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET)) +FPCMAKEGCCLIBDIR:=$(GCCLIBDIR) +endif +endif +ifndef FPCMAKEGCCLIBDIR FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif ifndef GCCLIBDIR CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(CROSSGCC),) diff --git a/packages/numlib/examples/Makefile b/packages/numlib/examples/Makefile index ea1b837074..1e609d4edc 100644 --- a/packages/numlib/examples/Makefile +++ b/packages/numlib/examples/Makefile @@ -2355,7 +2355,15 @@ endif endif endif endif +ifdef FPCFPMAKE +FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP) +ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET)) +FPCMAKEGCCLIBDIR:=$(GCCLIBDIR) +endif +endif +ifndef FPCMAKEGCCLIBDIR FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif ifndef GCCLIBDIR CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(CROSSGCC),) |