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

Fix path for sh on Android (#6661)

Browse source
This commit is contained in:
Fredrik Høisæther Rasch 2017-11-03 21:09:01 +01:00 • committed by Andreas Rumpf
commit de97f381fa
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/nim.cfg
View file

@ -98,7 +98,6 @@ path="$lib/pure"
clang.options.linker = "-landroid-glob" clang.options.linker = "-landroid-glob"
clang.cpp.options.linker = "-landroid-glob" clang.cpp.options.linker = "-landroid-glob"
tcc.options.linker = "-landroid-glob" tcc.options.linker = "-landroid-glob"
define:"useShPath:/system/bin/sh"
@end @end
@end @end

4
lib/pure/osproc.nim
View file

@ -767,7 +767,9 @@ elif not defined(useNimRtl):
var sysCommand: string var sysCommand: string
var sysArgsRaw: seq[string] var sysArgsRaw: seq[string]
if poEvalCommand in options: if poEvalCommand in options:
const useShPath {.strdefine.} = "/bin/sh" const useShPath {.strdefine.} =
when not defined(android): "/bin/sh"
else: "/system/bin/sh"
sysCommand = useShPath sysCommand = useShPath
sysArgsRaw = @[sysCommand, "-c", command] sysArgsRaw = @[sysCommand, "-c", command]
assert args.len == 0, "`args` has to be empty when using poEvalCommand." assert args.len == 0, "`args` has to be empty when using poEvalCommand."