From cb0b54dd8144b6ad493630a97e2fa6fd80a747d0 Mon Sep 17 00:00:00 2001 From: pierre Date: Fri, 20 Nov 2020 14:03:57 +0000 Subject: Regenerate all Makefile's, and update utils/fpcm/fpcmake.inc and utils/fpcm/revision.inc after commit 47483 git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@47484 3ad0048d-3df7-0310-abae-a5850022a9f2 --- tests/utils/Makefile | 4 ++-- tests/utils/testsuite/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/utils') diff --git a/tests/utils/Makefile b/tests/utils/Makefile index 39d5899636..45289e6694 100644 --- a/tests/utils/Makefile +++ b/tests/utils/Makefile @@ -1747,11 +1747,11 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -endif -ifneq ($(BINUTILSPREFIX),) +ifneq ($(RLINKPATH),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) diff --git a/tests/utils/testsuite/Makefile b/tests/utils/testsuite/Makefile index fd1c3ecd56..8eff8f9d64 100644 --- a/tests/utils/testsuite/Makefile +++ b/tests/utils/testsuite/Makefile @@ -3088,11 +3088,11 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -endif -ifneq ($(BINUTILSPREFIX),) +ifneq ($(RLINKPATH),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -- cgit v1.2.1