From c1e89d0a83f583ca9d3dd86743526a43fd1595be Mon Sep 17 00:00:00 2001
From: joost <joost@cnoc.nl>
Date: Fri, 28 Nov 2014 21:52:37 +0000
Subject: [PATCH]  * Not all compile-options are stored inside the
 unitconfigfile    anymore. So they have to be added.

git-svn-id: trunk@29175 -
---
 packages/fppkg/src/pkgfpmake.pp | 35 ++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/packages/fppkg/src/pkgfpmake.pp b/packages/fppkg/src/pkgfpmake.pp
index e7460f762a..168820d68d 100644
--- a/packages/fppkg/src/pkgfpmake.pp
+++ b/packages/fppkg/src/pkgfpmake.pp
@@ -308,30 +308,33 @@ begin
     end
   else
     begin
-      AddOption('--nofpccfg');
-      AddOption('--compiler='+CompilerOptions.Compiler);
-      AddOption('--cpu='+CPUToString(CompilerOptions.CompilerCPU));
-      AddOption('--os='+OSToString(CompilerOptions.CompilerOS));
       if CompilerOptions.HasOptions then
         AddOption('--options='+CompilerOptions.Options.DelimitedText);
-      if IsSuperUser or GlobalOptions.InstallGlobal then
-        begin
-          CondAddOption('--prefix',CompilerOptions.GlobalPrefix);
-          CondAddOption('--baseinstalldir',CompilerOptions.GlobalInstallDir);
-        end
-      else
-        begin
-          CondAddOption('--prefix',CompilerOptions.LocalPrefix);
-          CondAddOption('--baseinstalldir',CompilerOptions.LocalInstallDir);
-        end;
-      CondAddOption('--localunitdir',CompilerOptions.LocalInstallDir);
-      CondAddOption('--globalunitdir',CompilerOptions.GlobalInstallDir);
+
       if GlobalOptions.CustomFPMakeOptions<>'' then
         begin
         AddOption('--ignoreinvalidoption');
         AddOption(GlobalOptions.CustomFPMakeOptions);
         end;
     end;
+
+  AddOption('--nofpccfg');
+  AddOption('--compiler='+CompilerOptions.Compiler);
+  AddOption('--cpu='+CPUToString(CompilerOptions.CompilerCPU));
+  AddOption('--os='+OSToString(CompilerOptions.CompilerOS));
+  if IsSuperUser or GlobalOptions.InstallGlobal then
+    begin
+      CondAddOption('--prefix',CompilerOptions.GlobalPrefix);
+      CondAddOption('--baseinstalldir',CompilerOptions.GlobalInstallDir);
+    end
+  else
+    begin
+      CondAddOption('--prefix',CompilerOptions.LocalPrefix);
+      CondAddOption('--baseinstalldir',CompilerOptions.LocalInstallDir);
+    end;
+  CondAddOption('--localunitdir',CompilerOptions.LocalInstallDir);
+  CondAddOption('--globalunitdir',CompilerOptions.GlobalInstallDir);
+
   { Run FPMake }
   FPMakeBin:='fpmake'+ExeExt;
   SetCurrentDir(PackageBuildPath(P));