jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9015 from LemonBoy/fix-9013

Browse source 
Fix linking issue in cpp codegen
This commit is contained in:
Andreas Rumpf 2018-09-19 22:53:52 +02:00 • committed by GitHub
commit a19d2f76f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/system/hti.nim
View file

@ -103,6 +103,10 @@ type
PNimType = ptr TNimType PNimType = ptr TNimType
when defined(nimTypeNames): when defined(nimTypeNames):
# Declare this variable only once in system.nim
when declared(ThisIsSystem):
var nimTypeRoot {.compilerProc.}: PNimType var nimTypeRoot {.compilerProc.}: PNimType
else:
var nimTypeRoot {.importc.}: PNimType
# node.len may be the ``first`` element of a set # node.len may be the ``first`` element of a set

9
tests/cpp/t9013.nim Normal file
View file

@ -0,0 +1,9 @@
discard """
targets: "cpp"
cmd: "nim $target --debugger:native $options $file"
"""
# The --debugger switch is needed in order to enable the defined(nimTypeNames)
# code path in hti.nim
import typeinfo
var tt: Any