fix: Add option to install the WASI sysroot

Author: robertoraggi

CMakeLists.txt

@@ -32,6 +32,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # option to install tools
 option(CXX_INSTALL_TOOLS "Install tools" ON)
+option(CXX_INSTALL_WASI_SYSROOT "Install wasi sysroot" OFF)
 
 # if CMAKE_SYSTEM_NAME is WASI disable the exceptions
 if(CMAKE_SYSTEM_NAME STREQUAL "WASI")
@@ -55,6 +56,9 @@ FetchContent_Declare(
     GIT_SHALLOW     1
 )
 
+# set FMT_INSTALL to OFF to avoid installing fmt
+set(FMT_INSTALL OFF CACHE BOOL "" FORCE)
+
 FetchContent_MakeAvailable(fmt)
 
 FetchContent_Declare(

src/frontend/cxx/cli.cc

@@ -164,7 +164,8 @@ std::vector<CLIOptionDescr> options{
      CLIOptionDescrKind::kSeparated},
 
     {"-toolchain", "<id>",
-     "Set the toolchain to 'linux', 'darwin', 'wasm32', or 'windows'",
+     "Set the toolchain to 'linux', 'darwin', 'wasm32', or 'windows'. Defaults "
+     "to wasm32.",
      CLIOptionDescrKind::kSeparated},
 
     {"-verify", "Verify the diagnostic messages", &CLI::opt_verify},

src/frontend/cxx/frontend.cc

@@ -228,40 +228,36 @@ auto runOnFile(const CLI& cli, const std::string& fileName) -> bool {
   auto toolchainId = cli.getSingle("-toolchain");
 
   if (!toolchainId) {
-#if defined(__APPLE__)
-    toolchainId = "darwin";
-#elif defined(__wasi__)
     toolchainId = "wasm32";
-#elif defined(__linux__)
-    toolchainId = "linux";
-#elif defined(_MSC_VER)
-    toolchainId = "windows";
-#endif
   }
 
   if (toolchainId == "darwin") {
     toolchain = std::make_unique<MacOSToolchain>(preprocesor);
   } else if (toolchainId == "wasm32") {
     auto wasmToolchain = std::make_unique<Wasm32WasiToolchain>(preprocesor);
 
+    fs::path app_dir;
+
+#if __wasi__
+    app_dir = fs::path("/");
+#elif __unix__
+    char* app_name = realpath(cli.app_name.c_str(), nullptr);
+    app_dir = fs::path(app_name).remove_filename().string();
+    std::free(app_name);
+#endif
+
+    wasmToolchain->setAppdir(app_dir.string());
+
     if (auto paths = cli.get("--sysroot"); !paths.empty()) {
       wasmToolchain->setSysroot(paths.back());
     } else {
+      fs::path sysroot_dir;
 #if __wasi__
-      wasmToolchain->setSysroot("/wasi-sysroot");
+      sysroot_dir = fs::path("/wasi-sysroot");
 #elif __unix__
-      char* app_name = realpath(cli.app_name.c_str(), nullptr);
-
-      const fs::path app_dir = fs::path(app_name).remove_filename();
-      wasmToolchain->setAppdir(app_dir.string());
-
-      const auto sysroot_dir = app_dir / "../lib/wasi-sysroot";
-      wasmToolchain->setSysroot(sysroot_dir.string());
-
-      if (app_name) {
-        std::free(app_name);
-      }
+      sysroot_dir = app_dir / "../lib/wasi-sysroot";
 #endif
+      wasmToolchain->setSysroot(sysroot_dir.string());
     }
 
     toolchain = std::move(wasmToolchain);

src/lib/CMakeLists.txt

@@ -21,3 +21,9 @@ add_custom_target(link_wasi_sysroot ALL
     COMMAND ${CMAKE_COMMAND} -E create_symlink ${wasi_sysroot_SOURCE_DIR} wasi-sysroot)
 
 add_subdirectory(cxx)
+
+if (CXX_INSTALL_WASI_SYSROOT)
+    install(
+        DIRECTORY ${wasi_sysroot_SOURCE_DIR}/
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/wasi-sysroot)
+endif()

src/lib/cxx/CMakeLists.txt

@@ -19,3 +19,10 @@
 
 add_custom_target(link_cxx_include ALL
     COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/include include)
+
+file(GLOB_RECURSE HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
+
+install(
+    FILES ${HEADER_FILES}
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cxx/include
+)