paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-18 20:39:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

* When the OS,CPU or compiler are specifically given on the command line, the

Browse Source 
fpmake-compileroptions and default compileroptions can differ. Even when
   they are based on the same configuration file.

git-svn-id: trunk@20065 -
This commit is contained in:
joost 2012-01-13 15:39:27 +00:00
parent 46e3403c31
commit a26f1d9dd3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/fppkg/fppkg.pp
View File

@ -320,8 +320,12 @@ begin
FindInstalledPackages(FPMakeCompilerOptions,true);
CheckFPMakeDependencies;
// 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);
// Check for broken dependencies