浏览代码

Do not add libgcc directory to library directories with -Fl option if -Xd option is used

git-svn-id: trunk@48814 -
pierre 4 年之前
父节点
当前提交
f767a4ac09
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      packages/fpmkunit/src/fpmkunit.pp

+ 3 - 2
packages/fpmkunit/src/fpmkunit.pp

@@ -7176,8 +7176,9 @@ begin
 
 
   // libc-linker path (always for Linux, since required for LLVM and SEH; this does not
   // libc-linker path (always for Linux, since required for LLVM and SEH; this does not
   // force the linking of anything by itself, but just adds a search directory)
   // force the linking of anything by itself, but just adds a search directory)
-  if APackage.NeedLibC or
-     (Defaults.OS=linux) then
+  // Do not add it if -Xd option is used
+  if (APackage.NeedLibC or (Defaults.OS=linux)) and
+     ((not Defaults.HaveOptions) or (Defaults.Options.IndexOf('-Xd')=-1)) then
     begin
     begin
       if FCachedlibcPath='' then
       if FCachedlibcPath='' then
         begin
         begin