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

* Do not add the --prefix parameter when calling fpmake for building archives

Browse Source 
git-svn-id: trunk@34190 -
This commit is contained in:
joost 2016-07-22 22:14:26 +00:00
parent c3ac426131
commit 05779cc64c
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -406,8 +406,21 @@ end;
procedure TFPMakeRunnerArchive.Execute; procedure TFPMakeRunnerArchive.Execute;
var
StoredLocalPrefix: string;
StoredGlobalPrefix: string;
begin begin
RunFPMake('archive'); // In most (all?) cases we do not want a prefix in the archive.
StoredGlobalPrefix := CompilerOptions.GlobalPrefix;
StoredLocalPrefix := CompilerOptions.LocalPrefix;
CompilerOptions.GlobalPrefix := '';
CompilerOptions.LocalPrefix := '';
try
RunFPMake('archive');
finally
CompilerOptions.GlobalPrefix := StoredGlobalPrefix;
CompilerOptions.LocalPrefix := StoredLocalPrefix;
end;
end; end;