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

Merge branch 'devel' of https://github.com/Araq/Nimrod into devel

Browse source
This commit is contained in:
Araq 2014-11-16 20:43:39 +01:00
commit 69a994b59e
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/jsgen.nim
View file

@ -1669,7 +1669,8 @@ proc genHeader(): PRope =
"/* (c) 2014 Andreas Rumpf */$n$n" & "/* (c) 2014 Andreas Rumpf */$n$n" &
"$nvar Globals = this;$n" & "$nvar Globals = this;$n" &
"var framePtr = null;$n" & "var framePtr = null;$n" &
"var excHandler = null;$n", "var excHandler = null;$n" &
"var lastJSError = null;$n",
[toRope(VersionAsString)]) [toRope(VersionAsString)])
proc genModule(p: PProc, n: PNode) = proc genModule(p: PProc, n: PNode) =

3
config/nim.cfg
View file

@ -13,6 +13,9 @@ cc = gcc
arm.linux.gcc.exe = "arm-linux-gcc" arm.linux.gcc.exe = "arm-linux-gcc"
arm.linux.gcc.linkerexe = "arm-linux-gcc" arm.linux.gcc.linkerexe = "arm-linux-gcc"
mips.linux.gcc.exe = "mips-openwrt-linux-gcc"
mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc"
@if not nimfix: @if not nimfix:
cs:partial cs:partial
@end @end

6
lib/pure/osproc.nim
View file

@ -822,7 +822,11 @@ elif not defined(useNimRtl):
environ = data.sysEnv environ = data.sysEnv
discard execvp(data.sysCommand, data.sysArgs) discard execvp(data.sysCommand, data.sysArgs)
else: else:
discard execvpe(data.sysCommand, data.sysArgs, data.sysEnv) when defined(uClibc):
# uClibc environment (OpenWrt included) doesn't have the full execvpe
discard execve(data.sysCommand, data.sysArgs, data.sysEnv)
else:
discard execvpe(data.sysCommand, data.sysArgs, data.sysEnv)
else: else:
discard execve(data.sysCommand, data.sysArgs, data.sysEnv) discard execve(data.sysCommand, data.sysArgs, data.sysEnv)