paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-07 01:06:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

lazbuild: fixed compilation

Browse Source 
git-svn-id: trunk@28899 -
This commit is contained in:
mattias 2011-01-07 21:53:41 +00:00
parent 5e9003e17e
commit ea6c4b0e0b
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/lazbuild.lpr
View File

@ -516,8 +516,7 @@ begin
// compile all auto install dependencies // compile all auto install dependencies
CurResult:=PackageGraph.CompileRequiredPackages(nil, CurResult:=PackageGraph.CompileRequiredPackages(nil,
PackageGraph.FirstAutoInstallDependency, PackageGraph.FirstAutoInstallDependency,[pupAsNeeded]);
MiscellaneousOptions.BuildLazProfiles.Globals,[pupAsNeeded]);
if CurResult<>mrOk then exit; if CurResult<>mrOk then exit;
finally finally
@ -643,7 +642,6 @@ begin
// automatically compile required packages // automatically compile required packages
if PackageGraph.CompileRequiredPackages(nil, if PackageGraph.CompileRequiredPackages(nil,
Project1.FirstRequiredDependency, Project1.FirstRequiredDependency,
Project1.CompilerOptions.Globals,
[pupAsNeeded])<>mrOk [pupAsNeeded])<>mrOk
then then
Error(ErrorBuildFailed,'Project dependencies of '+AFilename); Error(ErrorBuildFailed,'Project dependencies of '+AFilename);
@ -689,7 +687,7 @@ begin
else else
CompilerFilename:=Project1.GetCompilerFilename; CompilerFilename:=Project1.GetCompilerFilename;
//DebugLn(['TMainIDE.DoBuildProject CompilerFilename="',CompilerFilename,'" CompilerPath="',Project1.CompilerOptions.CompilerPath,'"']); //DebugLn(['TMainIDE.DoBuildProject CompilerFilename="',CompilerFilename,'" CompilerPath="',Project1.CompilerOptions.CompilerPath,'"']);
CompilerParams:=Project1.CompilerOptions.MakeOptionsString(SrcFilename,nil,[]) CompilerParams:=Project1.CompilerOptions.MakeOptionsString(SrcFilename,[])
+' '+PrepareCmdLineOption(SrcFilename); +' '+PrepareCmdLineOption(SrcFilename);
// execute compilation tool 'Before' // execute compilation tool 'Before'