diff options
| author | Araq <rumpf_a@web.de> | 2014-07-01 23:01:09 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2014-07-01 23:01:09 +0200 |
| commit | ad29bed942187829b4b0242b2530629bd0af5349 (patch) | |
| tree | 424fc9270756f874fc84deba971fb57279f30c7c /compiler | |
| parent | b56f43c394a03bac441058be9d0754324352593d (diff) | |
| parent | 0eda72e1d2345b9050dcbe22ec17baacafc66cbb (diff) | |
| download | Nim-ad29bed942187829b4b0242b2530629bd0af5349.tar.gz | |
Merge branch 'devel' of https://github.com/Araq/Nimrod into devel
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/cgen.nim | 1 | ||||
| -rw-r--r-- | compiler/commands.nim | 5 | ||||
| -rw-r--r-- | compiler/modules.nim | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/compiler/cgen.nim b/compiler/cgen.nim index a5852c735..e2f3b5ab0 100644 --- a/compiler/cgen.nim +++ b/compiler/cgen.nim @@ -1050,6 +1050,7 @@ proc getSomeInitName(m: PSym, suffix: string): PRope = assert m.owner.kind == skPackage if {sfSystemModule, sfMainModule} * m.flags == {}: result = m.owner.name.s.mangle.toRope + result.app "_" result.app m.name.s result.app suffix diff --git a/compiler/commands.nim b/compiler/commands.nim index 366019c19..e920cc897 100644 --- a/compiler/commands.nim +++ b/compiler/commands.nim @@ -74,6 +74,11 @@ proc writeVersionInfo(pass: TCmdLinePass) = msgWriteln(`%`(HelpMessage, [VersionAsString, platform.OS[platform.hostOS].name, CPU[platform.hostCPU].name])) + + const gitHash = gorge("git log -n 1 --format=%H") + if gitHash.strip.len == 40: + msgWriteln("git hash: " & gitHash) + msgWriteln("active boot switches:" & usedRelease & usedAvoidTimeMachine & usedTinyC & usedGnuReadline & usedNativeStacktrace & usedNoCaas & usedFFI & usedBoehm & usedMarkAndSweep & usedGenerational & usedNoGC) diff --git a/compiler/modules.nim b/compiler/modules.nim index fb1940741..b102224cd 100644 --- a/compiler/modules.nim +++ b/compiler/modules.nim @@ -115,7 +115,7 @@ proc newModule(fileIdx: int32): PSym = new(result) result.id = - 1 # for better error checking result.kind = skModule - let filename = fileIdx.toFilename + let filename = fileIdx.toFullPath result.name = getIdent(splitFile(filename).name) if not isNimrodIdentifier(result.name.s): rawMessage(errInvalidModuleName, result.name.s) |