diff options
| author | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-03-01 18:23:01 +0000 |
|---|---|---|
| committer | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-03-01 18:23:01 +0000 |
| commit | ccc0046c6fa11d190b8157d3192da2c091bd0f45 (patch) | |
| tree | fc0b09dc9f05d39b2c6dc5604515586a9d26c690 | |
| parent | 2b214bf7069bc8a7d626a7ce4f93a8e54e702606 (diff) | |
| download | fpc-ccc0046c6fa11d190b8157d3192da2c091bd0f45.tar.gz | |
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: https://svn.freepascal.org/svn/fpc/branches/fixes_3_2@48854 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | packages/fpmkunit/src/fpmkunit.pp | 4 |
1 files changed, 3 insertions, 1 deletions
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 |