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

* fix condition for including a unit's object files or not when compiling with packages

Browse Source 
git-svn-id: trunk@43550 -
This commit is contained in:
svenbarth 2019-11-21 21:45:15 +00:00
parent 2a1d26cc90
commit bb3b1b06a7
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/pmodules.pas
View File

@ -2475,18 +2475,7 @@ type
hp:=tmodule(loaded_units.first); hp:=tmodule(loaded_units.first);
while assigned(hp) do while assigned(hp) do
begin begin
if (hp<>sysinitmod) { if (hp<>sysinitmod) and not assigned(hp.package) then
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 begin
linker.AddModuleFiles(hp); linker.AddModuleFiles(hp);
if mf_checkpointer_called in hp.moduleflags then if mf_checkpointer_called in hp.moduleflags then