From 85b4906f281359da1214058b58111db8c8ae3b91 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Wed, 16 Dec 2015 15:23:50 +0000
Subject: [PATCH] IDE: SearchCompilerCandidates: fixed searching for ppccpu.exe

git-svn-id: trunk@50845 -
---
 ide/initialsetupproc.pas | 4 ++--
 ide/lazconf.pp           | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ide/initialsetupproc.pas b/ide/initialsetupproc.pas
index 08d8e7feda..c820f78dd5 100644
--- a/ide/initialsetupproc.pas
+++ b/ide/initialsetupproc.pas
@@ -471,7 +471,7 @@ begin
     if CheckFile('fpc'+ExeExt,Result) then exit;
 
     // search ppccpu(.exe) in PATH
-    if CheckFile(GetDefaultCompilerFilename,Result) then exit;
+    if CheckFile(GetDefaultCompilerFilename(GetCompiledTargetCPU),Result) then exit;
 
     // check history
     Files:=EnvironmentOptions.CompilerFileHistory;
@@ -480,7 +480,7 @@ begin
         if CheckFile(Files[i],Result) then exit;
 
     // check paths with versions
-    ShortCompFile:=GetDefaultCompilerFilename;
+    ShortCompFile:='fpc'+ExeExt;
 
     // check $(LazarusDir)\fpc\bin\i386-win32\fpc.exe
     if CheckFile(SetDirSeparators('$(LazarusDir)/fpc/bin/$(TargetCPU)-$(TargetOS)/')+ShortCompFile,Result)
diff --git a/ide/lazconf.pp b/ide/lazconf.pp
index a816db047b..6479697270 100644
--- a/ide/lazconf.pp
+++ b/ide/lazconf.pp
@@ -92,7 +92,6 @@ procedure GetDefaultTestBuildDirs(List: TStrings);
 function CreateCompilerTestPascalFilename: 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
 function FindDefaultCompilerPath: string; // full path of GetDefaultCompilerFilename
 function FindDefaultMakePath: string; // full path of "make"
@@ -444,11 +443,6 @@ begin
     Result:=ExtractFilePath(Result)+lowercase(ExtractFileName(Result));
 end;
 
-function GetDefaultCompilerFilename: string;
-begin
-  Result:=DefineTemplates.GetDefaultCompilerFilename;
-end;
-
 function GetDefaultLazarusSrcDirectories: TStringList;
 var
   i: Integer;