Merge pull request #58 from nature-lang/feature/darwin

feat: support darwin architecture

Author: weiwenhao

CMakeLists.txt

@@ -27,9 +27,10 @@ if (CMAKE_BUILD_TYPE MATCHES Debug)
     set(BUILD_TYPE "debug")
     #    add_compile_definitions(NATURE_DEBUG)
     add_compile_definitions(DEBUG_LIR)
-    #    add_compile_definitions(DEBUG_ASM)
+    add_compile_definitions(DEBUG_ASM)
     add_compile_definitions(DEBUG_PARSER)
     #    add_compile_definitions(DEBUG_INTERVAL)
+    #    add_compile_definitions(DEBUG_MACHO)
     add_compile_definitions(ASSERT_ERROR)
     #    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O2")
     message("cmake type is debug")
@@ -40,20 +41,23 @@ configure_file("${PROJECT_SOURCE_DIR}/config/config.h.in" "${PROJECT_SOURCE_DIR}
 aux_source_directory(${PROJECT_SOURCE_DIR}/cmd CMD)
 file(GLOB_RECURSE SRC ${PROJECT_SOURCE_DIR}/src/*.c)
 aux_source_directory(${PROJECT_SOURCE_DIR}/utils UTILS)
+aux_source_directory(${PROJECT_SOURCE_DIR}/utils/ymal UTILS)
 
 # include 搜索路径, 有了这个就不需要在 add_executable 中声明 .h 文件了
+include_directories(./include)
 include_directories(.)
 
 add_executable(nature main.c ${SRC} ${CMD} ${UTILS})
 target_link_libraries(nature m) # 链接数学计算库
 
-enable_testing()
-add_subdirectory(tests)
-add_subdirectory(runtime EXCLUDE_FROM_ALL)
-
 # custom golang build package
 set(PACKAGE_BINARY_NAME npkg)
 set(GOBIN /usr/local/go/bin/go)
+set(PACKAGE_BINARY_PATH ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_BINARY_NAME})
+
+enable_testing()
+add_subdirectory(tests)
+add_subdirectory(runtime EXCLUDE_FROM_ALL)
 
 add_custom_target(${PACKAGE_BINARY_NAME} ALL
         COMMAND GOOS=${CMAKE_SYSTEM_NAME} GOARCH=${CMAKE_SYSTEM_PROCESSOR} ${GOBIN} build -o ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_BINARY_NAME} ${PROJECT_SOURCE_DIR}/package/main.go

cmake/cross.cmake

@@ -17,10 +17,18 @@ endif ()
 
 # 写入到系统变量中
 if (CMAKE_SYSTEM_NAME MATCHES darwin)
-    message("add compile def __DARWIN")
+    add_definitions(-D_XOPEN_SOURCE=700)
+    add_definitions(-D_DARWIN_C_SOURCE)
+
+    add_compile_options(-Wno-format)
+    add_compile_options(-Wno-return-type)
+
+    message("add compile def __DARWIN, D_XOPEN_SOURCE, D_DARWIN_C_SOURCE")
     add_compile_definitions(__DARWIN=1)
 else ()
-    message("add compile def __LINUX")
+    add_definitions(-D_GNU_SOURCE)
+
+    message("add compile def __LINUX, D_GNU_SOURCE, ")
     add_compile_definitions(__LINUX=1)
 endif ()
 

cmake/darwin-amd64-toolchain.cmake

@@ -1,7 +1,10 @@
 set(CMAKE_C_COMPILER cc)
 set(CMAKE_CXX_COMPILER c++)
 
+set(CMAKE_C_STANDARD 11)
+
 set(CMAKE_SYSTEM_NAME darwin)
 set(CMAKE_SYSTEM_PROCESSOR amd64)
 
+
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-format -Wno-return-type")

cmd/root.h

@@ -23,14 +23,14 @@ void cmd_entry(int argc, char **argv) {
     }
 
     struct option long_options[] = {
-            {"archive", no_argument, NULL, 0},
-            {"output", required_argument, NULL, 'o'},
-            {NULL, 0, NULL, 0}};
+            {"archive", no_argument,       NULL, 0},
+            {"output",  required_argument, NULL, 'o'},
+            {NULL, 0,                      NULL, 0}};
 
     int option_index = 0;
     int c;
 
-    bool libmain = false;
+    bool is_archive = false;
 
     // -o 参数解析
     // --archive 参数解析     int c;
@@ -61,19 +61,16 @@ void cmd_entry(int argc, char **argv) {
             }
             case 0: {
                 assert(strcmp(long_options[option_index].name, "archive") == 0);
-                libmain = true;
+                is_archive = true;
                 break;
             }
             default:
                 break;
         }
     }
 
-    if (libmain) {
-        build_libmain(build_file);
-    } else {
-        build(build_file);
-    }
+
+    build(build_file, is_archive);
 }
 
 #endif//NATURE_ROOT_H