paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-16 10:09:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fix compatibility with new Package Management system under Haiku

Browse Source 
(patch by Olivier Coursiere, mantis #25051)

git-svn-id: trunk@25573 -
This commit is contained in:
Jonas Maebe 2013-09-25 20:57:41 +00:00
parent 1eb2308ffa
commit 2c664ac6ae
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/systems/t_haiku.pas
View File

@ -170,6 +170,12 @@ end;
*****************************************************************************} *****************************************************************************}
Constructor TLinkerHaiku.Create; Constructor TLinkerHaiku.Create;
const
HomeNonPackagedDevLib = '/boot/home/config/non-packaged/develop/lib';
HomeDevLib = '/boot/home/config/develop/lib';
CommonNonPackagedDevLib = '/boot/common/non-packaged/develop/lib';
CommonDevLib = '/boot/common/develop/lib';
SystemDevLib = '/boot/system/develop/lib';
var var
s : string; s : string;
i : integer; i : integer;
@ -184,7 +190,17 @@ begin
{ since that is what the compiler expects. } { since that is what the compiler expects. }
if pos(';',s) = 0 then if pos(';',s) = 0 then
s:=s+';'; s:=s+';';
// Under Haiku with package management, BELIBRARIES is empty by default
// We have to look at those system paths, in this order.
// User can still customize BELIBRARIES. That is why it is looked at first.
LibrarySearchPath.AddPath(sysrootpath,s,true); {format:'path1;path2;...'} LibrarySearchPath.AddPath(sysrootpath,s,true); {format:'path1;path2;...'}
LibrarySearchPath.AddPath(sysrootpath, HomeNonPackagedDevLib, false);
LibrarySearchPath.AddPath(sysrootpath, HomeDevLib, false);
LibrarySearchPath.AddPath(sysrootpath, CommonNonPackagedDevLib, false);
LibrarySearchPath.AddPath(sysrootpath, CommonDevLib, false);
LibrarySearchPath.AddPath(sysrootpath, SystemDevLib, false);
end; end;