diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2014-11-16 20:38:24 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2014-11-16 20:38:24 +0100 |
| commit | 605b4a819f258839e1cb3a3b65cab2fe59b716d5 (patch) | |
| tree | a3de266f3703ed48d3ccccc9782751da648b7ecc | |
| parent | 9e00d3aec2da69c23cdb5dba0e3f654e99ded379 (diff) | |
| parent | 04069bbe9d9cef3e0f5a8cc6eb80c5a900ec0b86 (diff) | |
| download | Nim-605b4a819f258839e1cb3a3b65cab2fe59b716d5.tar.gz | |
Merge pull request #1662 from eliezedeck/devel
OpenWrt / uClibc patches
| -rw-r--r-- | config/nim.cfg | 3 | ||||
| -rw-r--r-- | lib/pure/osproc.nim | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/config/nim.cfg b/config/nim.cfg index 62fe3307e..ef416323a 100644 --- a/config/nim.cfg +++ b/config/nim.cfg @@ -13,6 +13,9 @@ cc = gcc arm.linux.gcc.exe = "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: cs:partial @end diff --git a/lib/pure/osproc.nim b/lib/pure/osproc.nim index 2983712c8..bfdb0efed 100644 --- a/lib/pure/osproc.nim +++ b/lib/pure/osproc.nim @@ -822,7 +822,11 @@ elif not defined(useNimRtl): environ = data.sysEnv discard execvp(data.sysCommand, data.sysArgs) 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: discard execve(data.sysCommand, data.sysArgs, data.sysEnv) |