From de97f381fa93de98afdbbfd900e9e9d66e2397c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=B8is=C3=A6ther=20Rasch?=
 <fredrik.rasch@gmail.com>
Date: Fri, 3 Nov 2017 21:09:01 +0100
Subject: [PATCH] Fix path for sh on Android (#6661)

---
 config/nim.cfg      | 1 -
 lib/pure/osproc.nim | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/nim.cfg b/config/nim.cfg
index 6ae55a9b2a..a146c4ebf4 100644
--- a/config/nim.cfg
+++ b/config/nim.cfg
@@ -98,7 +98,6 @@ path="$lib/pure"
     clang.options.linker = "-landroid-glob"
     clang.cpp.options.linker = "-landroid-glob"
     tcc.options.linker = "-landroid-glob"
-    define:"useShPath:/system/bin/sh"
   @end
 @end
 
diff --git a/lib/pure/osproc.nim b/lib/pure/osproc.nim
index 71d3d9c727..d768a7de99 100644
--- a/lib/pure/osproc.nim
+++ b/lib/pure/osproc.nim
@@ -767,7 +767,9 @@ elif not defined(useNimRtl):
     var sysCommand: string
     var sysArgsRaw: seq[string]
     if poEvalCommand in options:
-      const useShPath {.strdefine.} = "/bin/sh"
+      const useShPath {.strdefine.} =
+        when not defined(android): "/bin/sh"
+        else: "/system/bin/sh"
       sysCommand = useShPath
       sysArgsRaw = @[sysCommand, "-c", command]
       assert args.len == 0, "`args` has to be empty when using poEvalCommand."