Merge branch 'devel' of github.com:Araq/Nimrod into devel
Merging mainline devel.
This commit is contained in:
commit
1528421707
1 changed files with 4 additions and 0 deletions
|
|
@ -171,6 +171,10 @@ proc genSingleVar(p: BProc, a: PNode) =
|
|||
if sfCompileTime in v.flags: return
|
||||
var targetProc = p
|
||||
if sfGlobal in v.flags:
|
||||
if v.flags * {sfImportc, sfExportc} == {sfImportc} and
|
||||
a.sons[2].kind == nkEmpty and
|
||||
v.loc.flags * {lfHeader, lfNoDecl} != {}:
|
||||
return
|
||||
if sfPure in v.flags:
|
||||
# v.owner.kind != skModule:
|
||||
targetProc = p.module.preInitProc
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue