diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2016-01-04 16:53:29 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2016-01-04 16:53:29 +0100 |
| commit | 5ca65309dbb3c178f1d9454e3ea1a53852bf3ab7 (patch) | |
| tree | 0f26f181fd1637dcc86afaa06fddc7c3031f4282 | |
| parent | 93df1bc11a5ce9a3ff1d3d7486c486f263ac8848 (diff) | |
| parent | dee5f9ad4f27649d43da210bd3033e23aa4b1af8 (diff) | |
| download | Nim-5ca65309dbb3c178f1d9454e3ea1a53852bf3ab7.tar.gz | |
Merge pull request #3683 from yglukhov/osproc-droid
osproc fix for Android
| -rw-r--r-- | lib/pure/osproc.nim | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pure/osproc.nim b/lib/pure/osproc.nim index b703fab63..8560c3ee4 100644 --- a/lib/pure/osproc.nim +++ b/lib/pure/osproc.nim @@ -886,7 +886,7 @@ elif not defined(useNimRtl): discard write(data.pErrorPipe[writeIdx], addr error, sizeof(error)) exitnow(1) - when defined(macosx) or defined(freebsd) or defined(netbsd): + when defined(macosx) or defined(freebsd) or defined(netbsd) or defined(android): var environ {.importc.}: cstringArray proc startProcessAfterFork(data: ptr StartProcessData) = @@ -916,7 +916,7 @@ elif not defined(useNimRtl): discard fcntl(data.pErrorPipe[writeIdx], F_SETFD, FD_CLOEXEC) if data.optionPoUsePath: - when defined(macosx) or defined(freebsd) or defined(netbsd): + when defined(macosx) or defined(freebsd) or defined(netbsd) or defined(android): # MacOSX doesn't have execvpe, so we need workaround. # On MacOSX we can arrive here only from fork, so this is safe: environ = data.sysEnv |