From a1016245cc9dd217222c2d03d875cac4314c16f1 Mon Sep 17 00:00:00 2001
From: rrenderr <rrenderr@gmail.com>
Date: Wed, 10 Jan 2018 13:41:29 +0200
Subject: [PATCH] - fixed lock of a program when proc echo is called on Android
 5.x.x (#7054)

---
 lib/system/sysio.nim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/system/sysio.nim b/lib/system/sysio.nim
index 4348ffbb50..f638b299ce 100644
--- a/lib/system/sysio.nim
+++ b/lib/system/sysio.nim
@@ -406,7 +406,8 @@ proc setStdIoUnbuffered() =
 
 when declared(stdout):
   proc echoBinSafe(args: openArray[string]) {.compilerProc.} =
-    when not defined(windows):
+    # flockfile deadlocks some versions of Android 5.x.x
+    when not defined(windows) and not defined(android):
       proc flockfile(f: File) {.importc, noDecl.}
       proc funlockfile(f: File) {.importc, noDecl.}
       flockfile(stdout)
@@ -415,7 +416,7 @@ when declared(stdout):
     const linefeed = "\n" # can be 1 or more chars
     discard c_fwrite(linefeed.cstring, linefeed.len, 1, stdout)
     discard c_fflush(stdout)
-    when not defined(windows):
+    when not defined(windows) and not defined(android):
       funlockfile(stdout)
 
 {.pop.}