OSX testing

Author: redvers

src/libponyc/codegen/gencshim.cc

@@ -40,11 +40,21 @@
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <string>
 #include <vector>
 #include <sys/stat.h>
 
+/*
+  Compile-time default include headers for Nix enter here and are
+  interned into the executable so we don't need to wrap ponyc
+  or require the end user to specify them.
+*/
+#ifndef PONY_NIX_INCLUDE_DIRS
+#  define PONY_NIX_INCLUDE_DIRS ""
+#endif
+
 #ifdef PLATFORM_IS_WINDOWS
 #  define PATH_SLASH '\\'
 #else
@@ -349,6 +359,148 @@ static bool push_isystem(pass_opt_t* opt, std::vector<const char*>& args,
 }
 
 
+/*
+  Add each existing directory in a ':' deliminited list as an
+  -internal-isystem search directory.
+*/
+static bool add_colon_include_dirs(pass_opt_t* opt, const char* list,
+  std::vector<const char*>& args, errors_t* errors)
+{
+  if(list == NULL || list[0] == '\0')
+    return false;
+
+  bool any = false;
+  char buf[FILENAME_MAX];
+  size_t len = 0;
+  for(const char* p = list; ; p++)
+  {
+    if(*p == ':' || *p == '\0')
+    {
+      if(len > 0)
+      {
+        buf[len] = '\0';
+        any |= push_isystem(opt, args, errors, "-internal-isystem", buf, "");
+        len = 0;
+      }
+      if(*p == '\0')
+        break;
+    }
+    else if(len < sizeof(buf) - 1)
+    {
+      buf[len++] = *p;
+    }
+  }
+
+  return any;
+}
+
+/*
+  Unwrap the provided include directories from the nix environment.
+  As well as covering the basics, this should also include any
+  includes that would have come via pkgconf et al.
+*/
+static bool add_flag_string_include_dirs(pass_opt_t* opt, const char* flags,
+  std::vector<const char*>& args, errors_t* errors)
+{
+  if(flags == NULL || flags[0] == '\0')
+    return false;
+
+  // Tokenize on whitespace first, then interpret include-dir flags.
+  std::vector<const char*> toks;
+  char buf[FILENAME_MAX];
+  size_t len = 0;
+  for(const char* p = flags; ; p++)
+  {
+    if(*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r' || *p == '\0')
+    {
+      if(len > 0)
+      {
+        buf[len] = '\0';
+        toks.push_back(stringtab(opt->strtab, buf));
+        len = 0;
+      }
+      if(*p == '\0')
+        break;
+    }
+    else if(len < sizeof(buf) - 1)
+    {
+      buf[len++] = *p;
+    }
+  }
+
+  bool any = false;
+  for(size_t i = 0; i < toks.size(); i++)
+  {
+    const char* t = toks[i];
+    const char* dir = NULL;
+
+    if(strcmp(t, "-isystem") == 0 || strcmp(t, "-idirafter") == 0 ||
+      strcmp(t, "-iquote") == 0 || strcmp(t, "-I") == 0)
+    {
+      if(i + 1 < toks.size())
+        dir = toks[++i];
+    }
+    else if(strncmp(t, "-I", 2) == 0 && t[2] != '\0')
+    {
+      dir = t + 2;
+    }
+
+    if(dir != NULL)
+      any |= push_isystem(opt, args, errors, "-internal-isystem", dir, "");
+  }
+
+  return any;
+}
+
+static bool read_nix_support_file(const char* nix_cc, const char* name,
+  char* out, size_t outsz)
+{
+  char path[FILENAME_MAX];
+  snprintf(path, sizeof(path), "%s/nix-support/%s", nix_cc, name);
+
+  FILE* f = fopen(path, "rb");
+  if(f == NULL)
+    return false;
+
+  size_t n = fread(out, 1, outsz - 1, f);
+  fclose(f);
+  out[n] = '\0';
+
+  while(n > 0 && (out[n - 1] == '\n' || out[n - 1] == '\r' ||
+    out[n - 1] == ' ' || out[n - 1] == '\t'))
+    out[--n] = '\0';
+
+  return n > 0;
+}
+
+/*
+  Extra include files from the nix environment:
+    * PONY_NIX_INCLUDE_DIRS
+    * PONY_INCLUDE_DIRS
+    * NIX_CFLAGS_COMPILE
+*/
+static bool add_nix_include_dirs(pass_opt_t* opt,
+  std::vector<const char*>& args, errors_t* errors)
+{
+  bool any = false;
+
+  any |= add_colon_include_dirs(opt, PONY_NIX_INCLUDE_DIRS, args, errors);
+  any |= add_colon_include_dirs(opt, getenv("PONY_INCLUDE_DIRS"), args, errors);
+  any |= add_flag_string_include_dirs(opt, getenv("NIX_CFLAGS_COMPILE"), args,
+    errors);
+
+  const char* nix_cc = getenv("NIX_CC");
+  if(nix_cc != NULL && nix_cc[0] != '\0')
+  {
+    char cflags[FILENAME_MAX * 4];
+    if(read_nix_support_file(nix_cc, "libc-cflags", cflags, sizeof(cflags)))
+      any |= add_flag_string_include_dirs(opt, cflags, args, errors);
+  }
+
+  return any;
+}
+
+
 // System include directories for the target, derived from the same sysroot
 // the embedded linker uses — hand-rolled like LLD rather than driven through
 // clang's Driver, so the headers the shim compiles against stay consistent
@@ -488,6 +640,9 @@ static bool add_system_include_args(pass_opt_t* opt, const char* sysroot,
   any |= push_isystem(opt, args, errors, "-internal-externc-isystem",
     sysroot, "/usr/include");
 
+  if(sysroot[0] == '\0')
+    any |= add_nix_include_dirs(opt, args, errors);
+
   // Per-directory skipping is right (multiarch and /usr/local are
   // legitimately absent on many systems), but an explicit --sysroot that
   // yields nothing at all deserves a direct answer, like the macOS branch