From ea6c4b0e0bd2293b061d8d280eb0c6517497281b Mon Sep 17 00:00:00 2001 From: mattias Date: Fri, 7 Jan 2011 21:53:41 +0000 Subject: [PATCH] lazbuild: fixed compilation git-svn-id: trunk@28899 - --- ide/lazbuild.lpr | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ide/lazbuild.lpr b/ide/lazbuild.lpr index 40eef62e0c..5c9175ddd1 100644 --- a/ide/lazbuild.lpr +++ b/ide/lazbuild.lpr @@ -516,8 +516,7 @@ begin // compile all auto install dependencies CurResult:=PackageGraph.CompileRequiredPackages(nil, - PackageGraph.FirstAutoInstallDependency, - MiscellaneousOptions.BuildLazProfiles.Globals,[pupAsNeeded]); + PackageGraph.FirstAutoInstallDependency,[pupAsNeeded]); if CurResult<>mrOk then exit; finally @@ -643,7 +642,6 @@ begin // automatically compile required packages if PackageGraph.CompileRequiredPackages(nil, Project1.FirstRequiredDependency, - Project1.CompilerOptions.Globals, [pupAsNeeded])<>mrOk then Error(ErrorBuildFailed,'Project dependencies of '+AFilename); @@ -689,7 +687,7 @@ begin else CompilerFilename:=Project1.GetCompilerFilename; //DebugLn(['TMainIDE.DoBuildProject CompilerFilename="',CompilerFilename,'" CompilerPath="',Project1.CompilerOptions.CompilerPath,'"']); - CompilerParams:=Project1.CompilerOptions.MakeOptionsString(SrcFilename,nil,[]) + CompilerParams:=Project1.CompilerOptions.MakeOptionsString(SrcFilename,[]) +' '+PrepareCmdLineOption(SrcFilename); // execute compilation tool 'Before'