From d15cdd3483e398821c8f7542813b6ce9b4ad828c Mon Sep 17 00:00:00 2001
From: Bucky Kittinger <larrykittinger@gmail.com>
Date: Mon, 19 Nov 2018 10:48:42 -0500
Subject: [PATCH] adding support for Mac OSX

---
 libraries/CMakeLists.txt              |  2 +-
 libraries/crt/_crt.s                  | 10 +++++-----
 libraries/libc++/libcxx               |  2 +-
 modules/EosioWasmToolchain.cmake.in   |  1 +
 tools/include/compiler_options.hpp.in |  1 +
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
index 4f44eb713a..ccb45b5393 100644
--- a/libraries/CMakeLists.txt
+++ b/libraries/CMakeLists.txt
@@ -6,4 +6,4 @@ add_subdirectory(libc++)
 add_subdirectory(eosiolib)
 add_subdirectory(boost)
 add_subdirectory(crt)
-add_subdirectory(catch2)
+#add_subdirectory(catch2)
diff --git a/libraries/crt/_crt.s b/libraries/crt/_crt.s
index b509e7ab82..d58061d867 100644
--- a/libraries/crt/_crt.s
+++ b/libraries/crt/_crt.s
@@ -3,11 +3,11 @@
 .global _mmap
 .global setjmp
 .global longjmp
-.type _start,@function
-.type ___putc,@function
-.type _mmap,@function
-.type setjmp,@function
-.type longjmp,@function
+#.type _start,@function
+#.type ___putc,@function
+#.type _mmap,@function
+#.type setjmp,@function
+#.type longjmp,@function
 
 _start:
    mov %rsp, %rbp
diff --git a/libraries/libc++/libcxx b/libraries/libc++/libcxx
index de36c7a3c5..ef8d14da3c 160000
--- a/libraries/libc++/libcxx
+++ b/libraries/libc++/libcxx
@@ -1 +1 @@
-Subproject commit de36c7a3c5581db16ee49dfec608604d1a53521f
+Subproject commit ef8d14da3caebbdeb558bec32e7cba3489b94e86
diff --git a/modules/EosioWasmToolchain.cmake.in b/modules/EosioWasmToolchain.cmake.in
index e424490884..ad05efb579 100644
--- a/modules/EosioWasmToolchain.cmake.in
+++ b/modules/EosioWasmToolchain.cmake.in
@@ -31,6 +31,7 @@ set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
 # hack for OSX
 set(CMAKE_OSX_SYSROOT="@SYSROOT_DIR@")
 set(CMAKE_OSX_DEPLOYMENT_TARGET="")
+
 include_directories(
       @CDT_ROOT_DIR@/eosio.cdt/include/libcxx
       @CDT_ROOT_DIR@/eosio.cdt/include/libc
diff --git a/tools/include/compiler_options.hpp.in b/tools/include/compiler_options.hpp.in
index e385d8e231..ad028a702d 100644
--- a/tools/include/compiler_options.hpp.in
+++ b/tools/include/compiler_options.hpp.in
@@ -326,6 +326,7 @@ static void GetCompDefaults(std::vector<std::string>& copts) {
    } else {
 #ifdef __APPLE__
       copts.emplace_back("--target=x86_64-unknown-darwin-macho");
+      copts.emplace_back("-mmacosx-version-min=10.13");
 #else
       copts.emplace_back("--target=x86_64-unknown-linux-gnu");
       copts.emplace_back("-m64");