paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-18 00:29:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix for resolving libc-path on non-english Linux

Browse Source 
git-svn-id: trunk@31906 -
This commit is contained in:
joost 2015-10-01 20:14:47 +00:00
parent 239fc27c38
commit 5f46057eea
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/fpmkunit/src/fpmkunit.pp
View File

@ -2608,6 +2608,13 @@ function GetDefaultLibGCCDir(CPU : TCPU;OS: TOS; var ErrorMessage: string): stri
{$ifdef HAS_UNIT_PROCESS} {$ifdef HAS_UNIT_PROCESS}
ExecResult:=GetCompilerInfo(GccExecutable,'-v '+GCCParams, True); ExecResult:=GetCompilerInfo(GccExecutable,'-v '+GCCParams, True);
libgccFilename:=Get4thWord(ExecResult); libgccFilename:=Get4thWord(ExecResult);
// Use IsRelativePath to check if the 4th word is an (absolute) path.
// This depends on the language settings. In English the 4th word is
// empty, if this particular gcc version does not return the libgcc-
// filename on -v. But in other languages (e.g. Dutch) it may be another
// word.
if IsRelativePath(libgccFilename) then
libgccFilename:='';
if libgccFilename='' then if libgccFilename='' then
libgccFilename:=GetCompilerInfo(GccExecutable,'--print-libgcc-file-name '+GCCParams, False); libgccFilename:=GetCompilerInfo(GccExecutable,'--print-libgcc-file-name '+GCCParams, False);
result := ExtractFileDir(libgccFilename); result := ExtractFileDir(libgccFilename);