Ver código fonte

Merged revisions 2334 via svnmerge from
svn+ssh://[email protected]/FPC/svn/fpc/trunk

r2334 (jonas)
* fixed patch of r2313 (unit init code was not called anymore for
libraries)

git-svn-id: branches/fixes_2_0@2335 -

Jonas Maebe 19 anos atrás
pai
commit
4ae09e8ad9
1 arquivos alterados com 4 adições e 4 exclusões
  1. 4 4
      compiler/ncgutil.pas

+ 4 - 4
compiler/ncgutil.pas

@@ -1594,11 +1594,11 @@ implementation
           end;
 
         { call startup helpers from main program }
-        if (current_procinfo.procdef.proctypeoption=potype_proginit) and
-           not(current_module.islibrary) then
+        if (current_procinfo.procdef.proctypeoption=potype_proginit) then
          begin
-           if (target_info.system = system_powerpc_darwin) or
-              (target_info.system = system_powerpc_macos) then
+           if ((target_info.system = system_powerpc_darwin) or
+               (target_info.system = system_powerpc_macos)) and
+              not(current_module.islibrary) then
              begin
               { the parameters are already in the right registers }
               cg.a_call_name(list,target_info.cprefix+'FPC_SYSTEMMAIN');