adding support for Mac OSX

EOSIO · Nov 19, 2018 · d15cdd3 · d15cdd3
1 parent 7214963
commit d15cdd3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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");