From 4a4bc73855724455a510459e5c7e377e6053debc Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Sat, 21 Mar 2015 12:11:33 +0000
Subject: [PATCH] IDE/lazbuild: append global options to building IDE

git-svn-id: trunk@48445 -
---
 ide/buildlazdialog.pas | 6 ++++--
 ide/buildmanager.pas   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas
index 47810ba37a..dca4834f7e 100644
--- a/ide/buildlazdialog.pas
+++ b/ide/buildlazdialog.pas
@@ -58,7 +58,7 @@ uses
   // IDE
   LazarusIDEStrConsts, TransferMacros, LazConf, IDEProcs, DialogProcs,
   MainBar, ExtToolEditDlg, EnvironmentOpts,
-  ApplicationBundle, CompilerOptions, BuildProfileManager,
+  ApplicationBundle, ModeMatrixOpts, CompilerOptions, BuildProfileManager,
   GenericListEditor, GenericCheckList, IDECmdLine, PackageSystem, PackageDefs;
 
 type
@@ -418,7 +418,6 @@ begin
   Result:=mrCancel;
   fProfile:=Profile;
   if CalcTargets(Flags)<>mrOk then exit;
-  debugln(['TLazarusBuilder.MakeLazarus AAA1 ',fExtraOptions]);
 
   if LazarusIDE<>nil then
     LazarusIDE.MainBarSubTitle:=Profile.Name;
@@ -593,6 +592,9 @@ begin
     {$ENDIF}
 
     AppendExtraOption(fProfile.ExtraOptions,false);
+
+    if OnAppendCustomOption<>nil then
+      OnAppendCustomOption(Self,fExtraOptions,[bmgtEnvironment]);
   end;
 
   // set target filename and target directory:
diff --git a/ide/buildmanager.pas b/ide/buildmanager.pas
index 76104e72ce..335bad7676 100644
--- a/ide/buildmanager.pas
+++ b/ide/buildmanager.pas
@@ -2561,7 +2561,8 @@ begin
     Result:=BuildMatrixProjectName;
   end else if Sender is TLazPackage then begin
     Result:=TLazPackage(Sender).Name;
-  end;
+  end else
+    Result:='#';
   //debugln(['TBuildManager.GetModeMatrixTarget ',DbgSName(Sender),' Target="',Result,'"']);
 end;