darwin: partial merge of Charly Gordon's Darwin patch

Author: bvdberg

common/string_utils.c2

@@ -61,3 +61,10 @@ public fn void split_cmd_args(const char* input, char* cmd, char* args) @(unused
     }
 }
 
+public fn bool endsWith(const char* text, const char* tail) {
+    usize len1 = strlen(text);
+    usize len2 = strlen(tail);
+    if (len2 > len1) return false;
+    return (strcmp(&text[len1-len2], tail) == 0);
+}
+

common/target_info.c2

@@ -31,7 +31,7 @@ public type Abi enum u8 { Unknown, GNU, GNU_EABI, MACHO, WIN32, Rv32G }
 const char*[] system_names = { "unknown", "linux", "darwin", "cygwin" }
 static_assert(elemsof(System), elemsof(system_names));
 
-const char*[] arch_names = { "unknown", "i686", "arm", "x86_64", "arm_64", "riscv32" }
+const char*[] arch_names = { "unknown", "i686", "arm", "x86_64", "arm64", "riscv32" }
 static_assert(elemsof(Arch), elemsof(arch_names));
 
 const char*[] vendor_names = { "unknown", "apple" }

compiler/plugin_mgr.c2

@@ -20,6 +20,7 @@ import file_utils;
 import plugin_info;
 import string_list;
 import string_pool;
+import string_utils;
 
 import c_errno local;
 import constants;
@@ -29,6 +30,12 @@ import stdio;
 import stdlib;
 import string local;
 
+#if SYSTEM_DARWIN
+const char *lib_ext = ".dylib";
+#else
+const char *lib_ext = ".so";
+#endif
+
 type Plugin struct {
     u32 name; // in auxPool
     bool is_global;
@@ -97,11 +104,7 @@ fn bool is_plugin(const Dirent* entry) {
     const char* filename = entry.d_name;
     if (entry.d_type != DT_REG) return false;
     if (filename[0] == '.') return false;
-    usize len = strlen(filename);
-    if (len < 5) return false;
-    if (strcmp(&filename[len-3], ".so") != 0) return false;
-
-    return true;
+    return string_utils.endsWith(filename, lib_ext);
 }
 
 public fn void Mgr.show(const Mgr* m) {
@@ -140,7 +143,7 @@ fn bool Mgr.loadPlugin(Mgr* m, u32 name, u32 options, bool is_global) {
     const char* name_str = m.auxPool.idx2str(name);
 
     char[128] filename;
-    stdio.sprintf(filename, "lib%s.so", name_str);
+    stdio.sprintf(filename, "lib%s%s", name_str, lib_ext);
 
     char[constants.Max_path] fullname; // TODO use string_buffer?
 

env.sh

@@ -2,5 +2,4 @@ echo 'setting C2 environment'
 export C2_LIBDIR=~/c2_libs
 export C2_PLUGINDIR=~/c2_plugins
 export CC=clang
-export CXX=clang++
 #complete -W '-a -A -b -c -C -d -f -h -m -q -Q -r -s -S -t -T -v --check --create --fast --help --help-recipe --showlibs --showplugins --targets --test' c2c

generator/c_generator.c2

@@ -1299,7 +1299,7 @@ public fn void build(const char* output_dir)
     i32 retval = process_utils.run_args(dir, "make", LogFile, "-j");
     if (retval != 0) {
         console.error("error during external C compilation");
-        console.log("see %s%s for defails", dir, LogFile);
+        console.log("see %s%s for details", dir, LogFile);
     }
 }
 

generator/c_generator_special.c2

@@ -25,6 +25,7 @@ import file_utils;
 import module_list;
 import string_buffer;
 import string_list;
+import target_info;
 
 import string;
 import stdio;
@@ -144,12 +145,21 @@ fn void Generator.createMakefile(Generator* gen,
         break;
     case DynamicLibrary:
         out.add("CFLAGS+=-fPIC\n");
-        stdio.sprintf(target_name, "lib%s.so", gen.target);
+        if (gen.targetInfo.sys == target_info.System.Darwin) {
+            stdio.sprintf(target_name, "lib%s.dylib", gen.target);
+        } else {
+            stdio.sprintf(target_name, "lib%s.so", gen.target);
+        }
         out.print("all: ../%s\n\n", target_name);
 
         out.print("../%s: $(objects) $(headers)\n", target_name);
-	    out.print("\t\t$(CC) $(LDFLAGS) $(objects) -shared -o ../%s -Wl,-soname,%s.1 -Wl,--version-script=exports.version $(LDFLAGS2)\n",
-            target_name, target_name);
+
+        if (gen.targetInfo.sys == target_info.System.Darwin) {
+            out.print("\t\t$(CC) $(LDFLAGS) $(objects) -shared -o ../%s $(LDFLAGS2)\n", target_name);
+        } else {
+            out.print("\t\t$(CC) $(LDFLAGS) $(objects) -shared -o ../%s -Wl,-soname,%s.1 -Wl,--version-script=exports.version $(LDFLAGS2)\n",
+                target_name, target_name);
+        }
         break;
     }
 

install_plugins.sh

@@ -1,10 +1,21 @@
 #!/bin/sh
+
+if [ $(uname -s) = 'Darwin' ] ; then
+   LIB_EXT='.dylib'
+else
+   LIB_EXT='.so'
+fi
+
 set -e
 mkdir -p $C2_PLUGINDIR
-cp output/deps_generator/libdeps_generator.so $C2_PLUGINDIR
-cp output/git_version/libgit_version.so $C2_PLUGINDIR
-cp output/load_file/libload_file.so $C2_PLUGINDIR
-cp output/refs_generator/librefs_generator.so $C2_PLUGINDIR
-cp output/shell_cmd/libshell_cmd.so $C2_PLUGINDIR
-cp output/unit_test/libunit_test.so $C2_PLUGINDIR
-strip $C2_PLUGINDIR/*.so
+cp output/deps_generator/libdeps_generator$LIB_EXT $C2_PLUGINDIR
+cp output/git_version/libgit_version$LIB_EXT $C2_PLUGINDIR
+cp output/load_file/libload_file$LIB_EXT $C2_PLUGINDIR
+cp output/refs_generator/librefs_generator$LIB_EXT $C2_PLUGINDIR
+cp output/shell_cmd/libshell_cmd$LIB_EXT $C2_PLUGINDIR
+cp output/unit_test/libunit_test$LIB_EXT $C2_PLUGINDIR
+
+if [ $(uname -s) != 'Darwin' ] ; then
+   strip $C2_PLUGINDIR/*$LIB_EXT
+fi
+