paths: support multiple paths in C2_LIBDIR

* format: C2_LIBDIR=aa:bb:cc
* libs not needed by c2c itself will be moved to secondary archive
  later

Author: bvdberg

README.md

@@ -23,6 +23,7 @@ see the [installation document](INSTALL.md) for installation on Linux or OSX.
 The *C2_LIBDIR* should point to <path_to_c2compiler>/libs
 The *C2_PLUGINDIR* may be anywhere and is used by the install_plugins.sh script
 
+All these variables may contain multiple paths, separated by colons (:)
 
 ## Bootstrap
 

common/string_utils.c2

@@ -51,3 +51,24 @@ public fn bool endsWith(const char* text, const char* tail) @(unused) {
     usize tlen = strlen(tail);
     return (tlen <= len && !memcmp(text + len - tlen, tail, tlen));
 }
+
+// NOTE: path is not 0-terminated
+public type PathHandler fn void (void* arg, const char* path, u32 len);
+
+public fn void split_paths(const char* input, void* arg, PathHandler handler) @(unused) {
+    // split by ':'
+    const char* start = input;
+    const char* cp = start;
+    while (1) {
+        if (*cp == 0) {
+            if (cp != start) handler(arg, start, (u32)(cp - start));
+            return;
+        }
+        if (*cp == ':') {
+            if (cp != start) handler(arg, start, (u32)(cp - start));
+            start = cp+1;
+        }
+        cp++;
+    }
+}
+

compiler/compiler.c2

@@ -41,6 +41,7 @@ import source_mgr;
 import string_buffer;
 import string_list;
 import string_pool;
+import string_utils;
 import target_info;
 import unused_checker;
 import utils;
@@ -83,7 +84,7 @@ public type Options struct {
     bool asan;
     bool msan;
     bool ubsan;
-    u32 libdir; // from environment varible C2_LIBDIR, into auxPool
+    const char* libdir; // no ownership, from environment varible C2_LIBDIR
     char *target_triple;
 }
 
@@ -277,7 +278,10 @@ fn void Compiler.build(Compiler* c,
             console.error("images require a build-file");
             stdlib.exit(-1);
         }
-        if (c.opts.libdir) c.libdirs.add(c.opts.libdir);
+        if (c.opts.libdir) {
+            // parse into multiple, add each to string-pool
+            string_utils.split_paths(c.opts.libdir, c, handle_path);
+        }
         c.targetInfo.getNative();
     }
     if (target_str) {
@@ -678,3 +682,12 @@ fn void Compiler.addGlobalDefine(Compiler* c, const char* prefix, const char* ta
 
     c.addFeature(tmp, "1");
 }
+
+// NOTE: paths are not 0-terminated
+fn void handle_path(void* arg, const char* path, u32 len) {
+    Compiler* c = arg;
+    u32 path_idx = c.auxPool.add(path, len, true);
+    //stdio.printf("PATH [%s]\n", c.auxPool.idx2str(path_idx));
+    c.libdirs.add(path_idx);
+}
+

compiler/main.c2

@@ -510,9 +510,8 @@ fn void Context.handle_args(Context* c, i32 argc, char** argv) {
         }
     }
 
-    const char* libdir = getenv("C2_LIBDIR");
-    if (libdir) c.comp_opts.libdir = c.auxPool.addStr(libdir, true);
-    if (!libdir && !c.opts.build_file) {
+    c.comp_opts.libdir = getenv("C2_LIBDIR");
+    if (!c.comp_opts.libdir && !c.opts.build_file) {
         console.warn("environment variable C2_LIBDIR not set!");
     }
 }

env.sh

@@ -1,9 +1,12 @@
 if [ -f libs/libc/stdio.c2i ] ; then
    echo 'setting C2 development environment'
+   # NOTE: only add path to libs in this archive for boostrap
    export C2_LIBDIR=$PWD/libs
    export C2_PLUGINDIR=$PWD/output/plugins
 else
    echo 'setting C2 installation environment'
+   # NOTE: also adds path to other lib dir
+   #export C2_LIBDIR=~/c2_libs:~/c2_libs2
    export C2_LIBDIR=~/c2_libs
    export C2_PLUGINDIR=~/c2_plugins
 fi