paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-05 16:39:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: SearchCompilerCandidates: fixed searching for ppccpu.exe

Browse Source 
git-svn-id: trunk@50845 -
This commit is contained in:
mattias 2015-12-16 15:23:50 +00:00
parent 15485be3e7
commit 85b4906f28
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ide/initialsetupproc.pas
View File

@ -471,7 +471,7 @@ begin
if CheckFile('fpc'+ExeExt,Result) then exit; if CheckFile('fpc'+ExeExt,Result) then exit;
// search ppccpu(.exe) in PATH // search ppccpu(.exe) in PATH
if CheckFile(GetDefaultCompilerFilename,Result) then exit; if CheckFile(GetDefaultCompilerFilename(GetCompiledTargetCPU),Result) then exit;
// check history // check history
Files:=EnvironmentOptions.CompilerFileHistory; Files:=EnvironmentOptions.CompilerFileHistory;
@ -480,7 +480,7 @@ begin
if CheckFile(Files[i],Result) then exit; if CheckFile(Files[i],Result) then exit;
// check paths with versions // check paths with versions
ShortCompFile:=GetDefaultCompilerFilename; ShortCompFile:='fpc'+ExeExt;
// check $(LazarusDir)\fpc\bin\i386-win32\fpc.exe // check $(LazarusDir)\fpc\bin\i386-win32\fpc.exe
if CheckFile(SetDirSeparators('$(LazarusDir)/fpc/bin/$(TargetCPU)-$(TargetOS)/')+ShortCompFile,Result) if CheckFile(SetDirSeparators('$(LazarusDir)/fpc/bin/$(TargetCPU)-$(TargetOS)/')+ShortCompFile,Result)

6
ide/lazconf.pp
View File

@ -92,7 +92,6 @@ procedure GetDefaultTestBuildDirs(List: TStrings);
function CreateCompilerTestPascalFilename: string; function CreateCompilerTestPascalFilename: string;
function FindDefaultExecutablePath(const Executable: string): string; function FindDefaultExecutablePath(const Executable: string): string;
function GetDefaultCompilerFilename: string; // e.g. ppc386.exe
procedure GetDefaultCompilerFilenames(List: TStrings); // list of standard paths of compiler on various distributions procedure GetDefaultCompilerFilenames(List: TStrings); // list of standard paths of compiler on various distributions
function FindDefaultCompilerPath: string; // full path of GetDefaultCompilerFilename function FindDefaultCompilerPath: string; // full path of GetDefaultCompilerFilename
function FindDefaultMakePath: string; // full path of "make" function FindDefaultMakePath: string; // full path of "make"
@ -444,11 +443,6 @@ begin
Result:=ExtractFilePath(Result)+lowercase(ExtractFileName(Result)); Result:=ExtractFilePath(Result)+lowercase(ExtractFileName(Result));
end; end;
function GetDefaultCompilerFilename: string;
begin
Result:=DefineTemplates.GetDefaultCompilerFilename;
end;
function GetDefaultLazarusSrcDirectories: TStringList; function GetDefaultLazarusSrcDirectories: TStringList;
var var
i: Integer; i: Integer;