Merge branch 'devel'

rizsotto · rizsotto · commit 2d17bb5e9e04 · 2020-09-29T10:53:59.000+10:00
diff --git a/source/intercept-library/library/lib.cc b/source/intercept-library/library/lib.cc
@@ -31,8 +31,7 @@
 #if defined HAVE_NSGETENVIRON
 #include <crt_externs.h>
 #else
-#include <unistd.h>
-
+extern char **environ;
 #endif
 
 namespace {
diff --git a/source/libsys/source/Process.cc b/source/libsys/source/Process.cc
@@ -41,6 +41,8 @@
 #endif
 #ifdef HAVE_GNU_LIB_NAMES_H
 #include <gnu/lib-names.h>
+#else
+#define LIBC_SO "libc.so"
 #endif
 
 #include <spdlog/spdlog.h>
@@ -98,7 +100,6 @@ namespace {
         return rust::Ok(result);
     }
 
-#ifdef HAVE_GNU_LIB_NAMES_H
     rust::Result<spawn_function_t> resolve_spawn_function()
     {
         spawn_function_t fp = [](const char* path,
@@ -132,7 +133,6 @@ namespace {
         };
         return rust::Ok(fp);
     }
-#endif
 
     bool contains_separator(const std::string& path)
     {

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@`
`41`	`41`	`#endif`
`42`	`42`	`#ifdef HAVE_GNU_LIB_NAMES_H`
`43`	`43`	`#include <gnu/lib-names.h>`
	`44`	`+#else`
	`45`	`+#define LIBC_SO "libc.so"`
`44`	`46`	`#endif`
`45`	`47`
`46`	`48`	`#include <spdlog/spdlog.h>`
`@@ -98,7 +100,6 @@ namespace {`
`98`	`100`	`return rust::Ok(result);`
`99`	`101`	`}`
`100`	`102`
`101`		`-#ifdef HAVE_GNU_LIB_NAMES_H`
`102`	`103`	`rust::Result<spawn_function_t> resolve_spawn_function()`
`103`	`104`	`{`
`104`	`105`	`spawn_function_t fp = [](const char* path,`
`@@ -132,7 +133,6 @@ namespace {`
`132`	`133`	`};`
`133`	`134`	`return rust::Ok(fp);`
`134`	`135`	`}`
`135`		`-#endif`
`136`	`136`
`137`	`137`	`bool contains_separator(const std::string& path)`
`138`	`138`	`{`