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

* Search config file in same directory as actual compiler binary

Browse Source
This commit is contained in:
Michaël Van Canneyt 2023-11-02 11:06:55 +01:00 committed by Pierre Muller
parent 0028e6816f
commit b2c7f852d6
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
compiler/utils/fpc.pp
View File

@ -265,7 +265,7 @@ Const
end; end;
end; end;
Function FindConfigFile(const aFile : string) : String; Function FindConfigFile(const aFile : string; const aCompiler : String) : String;
// Adapted from check_configfile(fn:string; var foundfn:string):boolean; // Adapted from check_configfile(fn:string; var foundfn:string):boolean;
{ {
Order to read configuration file : Order to read configuration file :
@ -286,6 +286,7 @@ Function FindConfigFile(const aFile : string) : String;
} }
var var
{$ifdef unix}sl : rawbytestring;{$endif}
{$ifdef unix}hs,{$endif} aSearchPath,exepath,configpath : string; {$ifdef unix}hs,{$endif} aSearchPath,exepath,configpath : string;
Procedure AddToPath(aDir : String); Procedure AddToPath(aDir : String);
@ -313,7 +314,22 @@ begin
exit; exit;
end; end;
if configpath='' then if configpath='' then
begin
{
We need to search relative to compiler binary, not relative to FPC binary.
Beware of symlinks !
}
hs:=aCompiler;
While FileGetSymLinkTarget(hs,sl) do
begin
if copy(sl,1,1)<>'/' then
hs:=ExpandFileName(ExtractFilePath(hs)+sl)
else
hs:=sl;
end;
ExePath:=ExtractFilePath(hs);
configpath:=ExpandFileName(ExePath+'../etc/'); configpath:=ExpandFileName(ExePath+'../etc/');
end;
{$endif} {$endif}
AddToPath(ConfigPath); AddToPath(ConfigPath);
{$ifdef WINDOWS} {$ifdef WINDOWS}
@ -467,16 +483,16 @@ begin
end; end;
end; end;
end; end;
ppcbin := findcompiler(ppcbin, cpusuffix, exesuffix);
if (TargetName<>'') then if (TargetName<>'') then
begin begin
S:='fpc-'+lowercase(TargetName)+'.cfg'; S:='fpc-'+lowercase(TargetName)+'.cfg';
CfgFile:=FindConfigFile(s); CfgFile:=FindConfigFile(s,ppcbin);
if CfgFile='' then if CfgFile='' then
Error('Cannot find subtarget config file: '+s); Error('Cannot find subtarget config file: '+s);
ProcessConfigFile(CfgFile,ExeSuffix); ProcessConfigFile(CfgFile,ExeSuffix);
end; end;
SetLength(ppccommandline, ppccommandlinelen); SetLength(ppccommandline, ppccommandlinelen);
ppcbin := findcompiler(ppcbin, cpusuffix, exesuffix);
{ call ppcXXX } { call ppcXXX }
try try