paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 00:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

ide: fppkg: fixed allowing arbitrary paths on non windows

Browse Source
This commit is contained in:
mattias 2022-01-16 14:02:07 +01:00
parent 9d0d215489
commit dd95c55605
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ide/generatefppkgconfigurationdlg.pas
View File

@ -167,8 +167,10 @@ begin
CheckPath('C:\FPC', FpcPrefixCombobox.Items);
CheckPath('D:\FPC', FpcPrefixCombobox.Items);
{$ELSE}
CheckPath('/usr', FpcPrefixCombobox.Items);
CheckPath('/usr/local', FpcPrefixCombobox.Items);
CheckPath('/usr/lib/fpc', FpcPrefixCombobox.Items);
CheckPath('/usr/lib64/fpc', FpcPrefixCombobox.Items);
CheckPath('/usr/local/lib/fpc', FpcPrefixCombobox.Items);
CheckPath('/usr/local/lib64/fpc', FpcPrefixCombobox.Items);
{$ENDIF WINDOWS}
end;
@ -199,23 +201,9 @@ begin
end
else
begin
LibPath := AppendPathDelim(APrefix);
LibPathValid := True;
{$IFNDEF WINDOWS}
LibPath := ConcatPaths([APrefix, 'lib', 'fpc']);
if not DirPathExistsCached(LibPath) then
begin
LibPath := ConcatPaths([APrefix, 'lib64', 'fpc']);
if not DirPathExistsCached(LibPath) then
begin
LibPathValid := False;
end;
end;
{$ELSE}
LibPath := APrefix;
{$ENDIF}
LibPath := IncludeTrailingPathDelimiter(LibPath);
if DirPathExistsCached(LibPath+PathDelim+'fpmkinst') and
DirPathExistsCached(LibPath+PathDelim+'units') then
begin