From 92877826e95e77e3bb69c65f3db923c126f9b85a Mon Sep 17 00:00:00 2001
From: marco <marco@freepascal.org>
Date: Wed, 25 Nov 2020 17:16:26 +0000
Subject: [PATCH] --- Merging r45794 into '.': U    utils/fpcmkcfg/fpcmkcfg.pp
 --- Recording mergeinfo for merge of r45794 into '.':  U   .

# revisions: 45794
r45794 | florian | 2020-07-15 22:43:08 +0200 (Wed, 15 Jul 2020) | 1 line
Changed paths:
   M /trunk/utils/fpcmkcfg/fpcmkcfg.pp

  * set GCCLibPath for all architectures on linux as proposed in #37158, resolves #37158

git-svn-id: branches/fixes_3_2@47583 -
---
 utils/fpcmkcfg/fpcmkcfg.pp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/utils/fpcmkcfg/fpcmkcfg.pp b/utils/fpcmkcfg/fpcmkcfg.pp
index 33389a3b1c..40754e3833 100644
--- a/utils/fpcmkcfg/fpcmkcfg.pp
+++ b/utils/fpcmkcfg/fpcmkcfg.pp
@@ -238,6 +238,13 @@ begin
          AddConditionalLinkerPath('cpupowerpc', powerpc, result);
          AddConditionalLinkerPath('cpupowerpc64', powerpc64, result);
          end
+       else if CPU in [arm, aarch64] then
+         begin
+         AddConditionalLinkerPath('cpuarm', arm, result);
+         AddConditionalLinkerPath('cpuaarch64', aarch64, result);
+         end
+       else
+         result := '-Fl'+GetDefaultLibGCCDir(CPU, OS, S);
        end;
     darwin :
        begin