paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-24 13:09:17 +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

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

@ -308,30 +308,33 @@ begin
end end
else else
begin begin
AddOption('--nofpccfg');
AddOption('--compiler='+CompilerOptions.Compiler);
AddOption('--cpu='+CPUToString(CompilerOptions.CompilerCPU));
AddOption('--os='+OSToString(CompilerOptions.CompilerOS));
if CompilerOptions.HasOptions then if CompilerOptions.HasOptions then
AddOption('--options='+CompilerOptions.Options.DelimitedText); 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 if GlobalOptions.CustomFPMakeOptions<>'' then
begin begin
AddOption('--ignoreinvalidoption'); AddOption('--ignoreinvalidoption');
AddOption(GlobalOptions.CustomFPMakeOptions); AddOption(GlobalOptions.CustomFPMakeOptions);
end; end;
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 } { Run FPMake }
FPMakeBin:='fpmake'+ExeExt; FPMakeBin:='fpmake'+ExeExt;
SetCurrentDir(PackageBuildPath(P)); SetCurrentDir(PackageBuildPath(P));