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

+ cross compilation dir search added

Browse Source
This commit is contained in:
florian 2004-03-20 22:57:07 +00:00
parent 8621f97c1f
commit 292aa0175c
1 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
compiler/options.pas
View File

@ -1920,10 +1920,20 @@ begin
fpcdir:=FixPath(getenv('FPCDIR'),false); fpcdir:=FixPath(getenv('FPCDIR'),false);
if fpcdir='' then if fpcdir='' then
begin begin
if PathExists('/usr/local/lib/fpc/'+version_string) then if source_info.cpu<>target_info.cpu then
fpcdir:='/usr/local/lib/fpc/'+version_string+'/' begin
if PathExists('/usr/local/lib/fpc/'+version_string+'/cross/'+cpu2str[target_info.cpu]+'-'+target_info.shortname) then
fpcdir:='/usr/local/lib/fpc/'+version_string+'/cross/'+cpu2str[target_info.cpu]+'-'+target_info.shortname+'/'
else
fpcdir:='/usr/lib/fpc/'+version_string+'/cross/'+cpu2str[target_info.cpu]+'-'+target_info.shortname+'/';
end
else else
fpcdir:='/usr/lib/fpc/'+version_string+'/'; begin
if PathExists('/usr/local/lib/fpc/'+version_string) then
fpcdir:='/usr/local/lib/fpc/'+version_string+'/'
else
fpcdir:='/usr/lib/fpc/'+version_string+'/';
end;
end; end;
{$else} {$else}
fpcdir:=FixPath(getenv('FPCDIR'),false); fpcdir:=FixPath(getenv('FPCDIR'),false);
@ -1938,13 +1948,26 @@ begin
{ first try development RTL, else use the default installation path } { first try development RTL, else use the default installation path }
if not disable_configfile then if not disable_configfile then
begin begin
if PathExists(FpcDir+'rtl/'+lower(target_info.shortname)) then if source_info.cpu<>target_info.cpu then
UnitSearchPath.AddPath(FpcDir+'rtl/'+lower(target_info.shortname),false) begin
if PathExists(FpcDir+'rtl/'+lower(target_info.shortname)) then
UnitSearchPath.AddPath(FpcDir+'rtl/'+lower(target_info.shortname),false)
else
begin
UnitSearchPath.AddPath(FpcDir+'units/',false);
UnitSearchPath.AddPath(FpcDir+'units/rtl',false);
end;
end
else else
begin begin
UnitSearchPath.AddPath(FpcDir+'units/'+lower(target_info.shortname),false); if PathExists(FpcDir+'rtl/'+lower(target_info.shortname)) then
UnitSearchPath.AddPath(FpcDir+'units/'+lower(target_info.shortname)+'/rtl',false); UnitSearchPath.AddPath(FpcDir+'rtl/'+lower(target_info.shortname),false)
end; else
begin
UnitSearchPath.AddPath(FpcDir+'units/'+lower(target_info.shortname),false);
UnitSearchPath.AddPath(FpcDir+'units/'+lower(target_info.shortname)+'/rtl',false);
end;
end;
end; end;
{ Add exepath if the exe is not in the current dir, because that is always searched already. { Add exepath if the exe is not in the current dir, because that is always searched already.
Do not add it when linking on the target because then we can maybe already find Do not add it when linking on the target because then we can maybe already find
@ -2006,7 +2029,10 @@ finalization
end. end.
{ {
$Log$ $Log$
Revision 1.127 2004-03-10 22:52:57 peter Revision 1.128 2004-03-20 22:57:07 florian
+ cross compilation dir search added
Revision 1.127 2004/03/10 22:52:57 peter
* more stabs fixes * more stabs fixes
* special mode -gv for valgrind compatible stabs * special mode -gv for valgrind compatible stabs