From 6737634d88a70a3d87774c9f51f2ac6d2bf4da4f Mon Sep 17 00:00:00 2001
From: alaviss <alaviss@users.noreply.github.com>
Date: Tue, 8 Jan 2019 18:41:15 +0700
Subject: [PATCH] os.execShellCmd: fixes #10231 (#10232)

Darwin has long deprecated the wait union, but their macros still assume
it unless you define _POSIX_C_SOURCE. This trips up C++ compilers.

This commit duplicates the behavior of WEXITSTATUS when _POSIX_C_SOURCE
is defined.
---
 lib/pure/os.nim         |  4 +++-
 tests/stdlib/t10231.nim | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 tests/stdlib/t10231.nim

diff --git a/lib/pure/os.nim b/lib/pure/os.nim
index a218121ed1..3a959d4e2c 100644
--- a/lib/pure/os.nim
+++ b/lib/pure/os.nim
@@ -1297,7 +1297,9 @@ proc execShellCmd*(command: string): int {.rtl, extern: "nos$1",
   ## the process has finished. To execute a program without having a
   ## shell involved, use the `execProcess` proc of the `osproc`
   ## module.
-  when defined(posix):
+  when defined(macosx):
+    result = c_system(command) shr 8
+  elif defined(posix):
     result = WEXITSTATUS(c_system(command))
   else:
     result = c_system(command)
diff --git a/tests/stdlib/t10231.nim b/tests/stdlib/t10231.nim
new file mode 100644
index 0000000000..5d1101aa42
--- /dev/null
+++ b/tests/stdlib/t10231.nim
@@ -0,0 +1,13 @@
+discard """
+  target: cpp
+  action: run
+  exitcode: 0
+"""
+
+import os
+
+if paramCount() == 0:
+  # main process
+  doAssert execShellCmd(getAppFilename().quoteShell & " test") == 1
+else:
+  quit 1