Skip to content

Commit

Permalink
Final small changes for new release.
Browse files Browse the repository at this point in the history
  • Loading branch information
LongDirtyAnimAlf committed Oct 8, 2018
1 parent 68c8878 commit 577c799
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion fpcupdeluxemainform.pas
Original file line number Diff line number Diff line change
Expand Up @@ -2036,7 +2036,7 @@ function TForm1.InstallCrossCompiler(Sender: TObject):boolean;
BinsFileName:='';

if ((Sender<>nil) AND (CheckAutoClear.Checked)) then memoSummary.Clear;
memoSummary.Lines.Append('New try building a cross-compiler for '+FPCupManager.CrossOS_Target+'-'+FPCupManager.CrossCPU_Target);
memoSummary.Lines.Append('New try building a cross-compiler for '+FPCupManager.CrossOS_Target+'-'+FPCupManager.CrossCPU_Target+'.');

AddMessage('Looking for fpcupdeluxe cross-tools on GitHub (if any).');

Expand Down Expand Up @@ -2345,6 +2345,7 @@ function TForm1.InstallCrossCompiler(Sender: TObject):boolean;
FPCVersionLabel.Font.Color:=clDefault;
LazarusVersionLabel.Font.Color:=clDefault;
AddMessage('Got all tools now. Building a cross-compiler for '+FPCupManager.CrossOS_Target+'-'+FPCupManager.CrossCPU_Target,True);
memoSummary.Lines.Append('Got all tools now. Start building cross-compiler.');
if Assigned(FPCupManager.Sequencer) then FPCupManager.Sequencer.ResetAllExecuted;
RealRun;
end;
Expand Down
3 changes: 2 additions & 1 deletion installerfpc.pas
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,8 @@ function TFPCCrossInstaller.BuildModuleCustom(ModuleName: string): boolean;
Processor.Executable := Make;
Processor.CurrentDirectory:=ExcludeTrailingPathDelimiter(FSourceDirectory);
Processor.Parameters.Clear;
if ((FCPUCount>1) AND (NOT FNoJobs)) then Processor.Parameters.Add('--jobs='+IntToStr(FCPUCount));
//Using jobs can give problems on some systems ... disable for now.
//if ((FCPUCount>1) AND (NOT FNoJobs)) then Processor.Parameters.Add('--jobs='+IntToStr(FCPUCount));
Processor.Parameters.Add('--directory='+ ExcludeTrailingPathDelimiter(FSourceDirectory));
Processor.Parameters.Add('INSTALL_PREFIX='+ExcludeTrailingPathDelimiter(FInstallDirectory));
// Tell make where to find the target binutils if cross-compiling:
Expand Down

0 comments on commit 577c799

Please sign in to comment.