瀏覽代碼

--- 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 -

marco 4 年之前
父節點
當前提交
92877826e9
共有 1 個文件被更改,包括 7 次插入0 次删除
  1. 7 0
      utils/fpcmkcfg/fpcmkcfg.pp

+ 7 - 0
utils/fpcmkcfg/fpcmkcfg.pp

@@ -238,6 +238,13 @@ begin
          AddConditionalLinkerPath('cpupowerpc', powerpc, result);
          AddConditionalLinkerPath('cpupowerpc', powerpc, result);
          AddConditionalLinkerPath('cpupowerpc64', powerpc64, result);
          AddConditionalLinkerPath('cpupowerpc64', powerpc64, result);
          end
          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;
        end;
     darwin :
     darwin :
        begin
        begin