feat: re-run with LD_LIBRARY_PATH

share/cpp2b.cppm.tpl

@@ -1,6 +1,15 @@
+module;
+
+#ifdef _MSC_VER
+#	include <processenv.h>
+#else
+#	include <stdlib.h>
+#endif
+
 export module cpp2b;
 
 import std;
+import std.compat;
 
 export namespace cpp2b {
 
@@ -48,3 +57,22 @@ constexpr auto install_dir() -> const std::string_view {
 }
 
 } // namespace cpp2b
+
+export namespace cpp2b::env {
+inline auto set_var(const std::string& name, const std::string& value) -> void {
+#if defined(_MSC_VER)
+	SetEnvironmentVariableA(name.c_str(), value.c_str());
+#else
+	setenv(name.c_str(), value.c_str(), 1);
+#endif
+}
+
+inline auto get_var(const std::string& name) -> std::optional<std::string> {
+	auto val = std::getenv(name.c_str());
+	if(val != nullptr) {
+		return std::string{val};
+	}
+
+	return {};
+}
+}

src/main.cpp2

@@ -306,6 +306,15 @@ run_with_msvc_env_vars: (args) -> int = {
 	return std::system(cmd_str.c_str());
 }
 
+run_with_args: (args) -> int = {
+	cmd_str: std::string = "";
+	for args do (arg) {
+		cmd_str += " (arg)$";
+	}
+
+	return std::system(cmd_str.c_str());
+}
+
 main: (args) -> int = {
 	using std::views::drop;
 
@@ -324,6 +333,14 @@ main: (args) -> int = {
 		} else {
 			log_info("using vs tools {}", getenv_sv("VCToolsVersion").expect("msvc env internal error"));
 		}
+	} else {
+		libcxx_lib_dir := get_libcxx_build_root() / "lib";
+		ld_library_path := cpp2b::env::get_var("LD_LIBRARY_PATH");
+		if !ld_library_path || !ld_library_path*.contains(libcxx_lib_dir.string()) {
+			log_info("setting LD_LIBRARY_PATH to '{}'", libcxx_lib_dir.string());
+			cpp2b::env::set_var("LD_LIBRARY_PATH", libcxx_lib_dir.string());
+			return run_with_args(argz);
+		}
 	}
 
 	ensure_dir(".cache/cpp2/mod");