From 577c799a8c73612644a76ccb392046e805086ca8 Mon Sep 17 00:00:00 2001 From: LongDirtyAnimAlf Date: Mon, 8 Oct 2018 15:09:50 +0200 Subject: [PATCH] Final small changes for new release. --- fpcupdeluxemainform.pas | 3 ++- installerfpc.pas | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fpcupdeluxemainform.pas b/fpcupdeluxemainform.pas index 781888d4..c603fb63 100644 --- a/fpcupdeluxemainform.pas +++ b/fpcupdeluxemainform.pas @@ -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).'); @@ -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; diff --git a/installerfpc.pas b/installerfpc.pas index e4d43e64..f5ca8654 100755 --- a/installerfpc.pas +++ b/installerfpc.pas @@ -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: