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

* fix usage of ppumove generated shared libraries

Browse Source 
git-svn-id: trunk@43495 -
This commit is contained in:
florian 2019-11-16 14:07:32 +00:00
parent f5d5e84649
commit 13ab35e3ef
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
compiler/pmodules.pas
View File

@ -126,10 +126,10 @@ implementation
current_module.headerflags:=current_module.headerflags or uf_static_linked;
if create_smartlink_library then
begin
current_module.linkunitstaticlibs.add(current_module.staticlibfilename ,link_smart);
current_module.headerflags:=current_module.headerflags or uf_smart_linked;
end;
begin
current_module.linkunitstaticlibs.add(current_module.staticlibfilename ,link_smart);
current_module.headerflags:=current_module.headerflags or uf_smart_linked;
end;
if cs_lto in current_settings.moduleswitches then
begin
current_module.linkunitofiles.add(ChangeFileExt(current_module.objfilename,LTOExt),link_lto);
@ -2475,7 +2475,18 @@ type
hp:=tmodule(loaded_units.first);
while assigned(hp) do
begin
if (hp<>sysinitmod) and ((hp.headerflags and uf_in_library)=0) then
if (hp<>sysinitmod) {
I commented the following condition as it breaks linking with units being shared libs.
The needed shared libs and object files are ignored
and ((hp.headerflags and uf_in_library)=0)
I think the right condition is
not(assigned(hp.package))
as later on for packages the right shared libs are added separately (FK)
} then
begin
linker.AddModuleFiles(hp);
if mf_checkpointer_called in hp.moduleflags then