summaryrefslogtreecommitdiff
path: root/utils/unicode
diff options
context:
space:
mode:
authorpierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2>2020-05-13 13:53:15 +0000
committerpierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2>2020-05-13 13:53:15 +0000
commit4f0622a80c3c2bf8f3c3c400f972b90841717c43 (patch)
treeac6fa2dec1ffa44063fa9c7856a51c7d44458143 /utils/unicode
parent9e0b2e34ffbf83eef39a76bb0bc35966fb743eda (diff)
downloadfpc-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 'utils/unicode')
-rw-r--r--utils/unicode/Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/utils/unicode/Makefile b/utils/unicode/Makefile
index a9246daa88..391a9f9299 100644
--- a/utils/unicode/Makefile
+++ b/utils/unicode/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),)