Переглянути джерело

* When the OS,CPU or compiler are specifically given on the command line, the
fpmake-compileroptions and default compileroptions can differ. Even when
they are based on the same configuration file.

git-svn-id: trunk@20065 -

joost 13 роки тому
батько
коміт
a26f1d9dd3
1 змінених файлів з 6 додано та 2 видалено
  1. 6 2
      utils/fppkg/fppkg.pp

+ 6 - 2
utils/fppkg/fppkg.pp

@@ -320,8 +320,12 @@ begin
     FindInstalledPackages(FPMakeCompilerOptions,true);
     FindInstalledPackages(FPMakeCompilerOptions,true);
     CheckFPMakeDependencies;
     CheckFPMakeDependencies;
     // We only need to reload the status when we use a different
     // We only need to reload the status when we use a different
-    // configuration for compiling fpmake
-    if GlobalOptions.CompilerConfig<>GlobalOptions.FPMakeCompilerConfig then
+    // configuration for compiling fpmake or when the CPU, OS or compiler
+    // are set in the command-line
+    if (GlobalOptions.CompilerConfig<>GlobalOptions.FPMakeCompilerConfig) or
+       (CompilerOptions.CompilerCPU<>FPMakeCompilerOptions.CompilerCPU) or
+       (CompilerOptions.CompilerOS<>FPMakeCompilerOptions.CompilerOS) or
+       (CompilerOptions.Compiler<>FPMakeCompilerOptions.Compiler) then
       FindInstalledPackages(CompilerOptions,true);
       FindInstalledPackages(CompilerOptions,true);
 
 
     // Check for broken dependencies
     // Check for broken dependencies