paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-26 14:30:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Not all compile-options are stored inside the unitconfigfile

Browse Source 
anymore. So they have to be added.

git-svn-id: trunk@29175 -
This commit is contained in:
joost 2014-11-28 21:52:37 +00:00
parent 0574714317
commit c1e89d0a83
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/fppkg/src/pkgfpmake.pp
View File

@ -308,12 +308,20 @@ begin
end end
else else
begin begin
if CompilerOptions.HasOptions then
AddOption('--options='+CompilerOptions.Options.DelimitedText);
if GlobalOptions.CustomFPMakeOptions<>'' then
begin
AddOption('--ignoreinvalidoption');
AddOption(GlobalOptions.CustomFPMakeOptions);
end;
end;
AddOption('--nofpccfg'); AddOption('--nofpccfg');
AddOption('--compiler='+CompilerOptions.Compiler); AddOption('--compiler='+CompilerOptions.Compiler);
AddOption('--cpu='+CPUToString(CompilerOptions.CompilerCPU)); AddOption('--cpu='+CPUToString(CompilerOptions.CompilerCPU));
AddOption('--os='+OSToString(CompilerOptions.CompilerOS)); AddOption('--os='+OSToString(CompilerOptions.CompilerOS));
if CompilerOptions.HasOptions then
AddOption('--options='+CompilerOptions.Options.DelimitedText);
if IsSuperUser or GlobalOptions.InstallGlobal then if IsSuperUser or GlobalOptions.InstallGlobal then
begin begin
CondAddOption('--prefix',CompilerOptions.GlobalPrefix); CondAddOption('--prefix',CompilerOptions.GlobalPrefix);
@ -326,12 +334,7 @@ begin
end; end;
CondAddOption('--localunitdir',CompilerOptions.LocalInstallDir); CondAddOption('--localunitdir',CompilerOptions.LocalInstallDir);
CondAddOption('--globalunitdir',CompilerOptions.GlobalInstallDir); CondAddOption('--globalunitdir',CompilerOptions.GlobalInstallDir);
if GlobalOptions.CustomFPMakeOptions<>'' then
begin
AddOption('--ignoreinvalidoption');
AddOption(GlobalOptions.CustomFPMakeOptions);
end;
end;
{ Run FPMake } { Run FPMake }
FPMakeBin:='fpmake'+ExeExt; FPMakeBin:='fpmake'+ExeExt;
SetCurrentDir(PackageBuildPath(P)); SetCurrentDir(PackageBuildPath(P));