From 855efcaad6f2ebec3cab4965640beade876f29da Mon Sep 17 00:00:00 2001 From: pierre Date: Mon, 1 Mar 2021 18:23:01 +0000 Subject: [PATCH] Merge commit 48814: ------------------------------------------------------------------------ r48814 | pierre | 2021-02-26 17:15:30 +0000 (Fri, 26 Feb 2021) | 1 line Do not add libgcc directory to library directories with -Fl option if -Xd option is used ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@48854 - --- packages/fpmkunit/src/fpmkunit.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/fpmkunit/src/fpmkunit.pp b/packages/fpmkunit/src/fpmkunit.pp index 5b2322dc59..979371f889 100644 --- a/packages/fpmkunit/src/fpmkunit.pp +++ b/packages/fpmkunit/src/fpmkunit.pp @@ -6811,7 +6811,9 @@ begin FreeAndNil(L); // libc-linker path - if APackage.NeedLibC then + // Do not add it if -Xd option is used + if APackage.NeedLibC and + ((not Defaults.HaveOptions) or (Defaults.Options.IndexOf('-Xd')=-1)) then begin if FCachedlibcPath='' then begin