Change Rust integration to emit a single static library instead of compiling multiple crates to static libs and trying to link all of them into the final binary

This also replaces linking SpiderMonkey's Rust static library with including the required crates into our own library, achieving an end result of having a single static Rust library to link.

Author: tschneidereit

CMakeLists.txt

@@ -89,7 +89,7 @@ else()
     endif()
 endif()
 
-target_link_libraries(starling.wasm PRIVATE host_api extension_api builtins spidermonkey rust-url)
+target_link_libraries(starling.wasm PRIVATE host_api extension_api builtins spidermonkey rust_staticlib rust-glue)
 
 # build a compilation cache of ICs
 if(WEVAL)
@@ -112,9 +112,8 @@ endif()
 
 set(RUNTIME_FILE "starling.wasm")
 set(ADAPTER_FILE "preview1-adapter.wasm")
-configure_file("componentize.sh" "${CMAKE_CURRENT_BINARY_DIR}/componentize.sh" @ONLY)
+configure_file("componentize.sh.in" "${CMAKE_CURRENT_BINARY_DIR}/componentize.sh" @ONLY)
 configure_file(${ADAPTER} "${CMAKE_CURRENT_BINARY_DIR}/${ADAPTER_FILE}" COPYONLY)
-configure_file(spin.toml spin.toml COPYONLY)
 
 function(componentize OUTPUT)
     set(options)

cmake/add_builtin.cmake

@@ -97,9 +97,10 @@ function(add_builtin)
 endfunction()
 
 
-function(add_rust_builtin)
+function(add_rust_builtin name path)
     # TODO: restore additional config args
-    list(GET ARGN 0 LIB_NAME)
+    set(LIB_NAME ${name})
+    set(LIB_PATH ${path})
     set(DEFAULT_ENABLE ON)
     set(LIB_TARGET_NAME ${LIB_NAME})
     string(REPLACE "-" "_" LIB_NAME ${LIB_NAME})
@@ -123,7 +124,7 @@ function(add_rust_builtin)
 
     message(STATUS "Adding builtin ${DESCRIPTION}")
 
-    target_link_libraries(builtins PRIVATE ${LIB_TARGET_NAME} rust-glue)
+    add_rust_lib(${name} ${path})
     add_dependencies(${LIB_TARGET_NAME} rust-bindings)
 
     file(APPEND $CACHE{INSTALL_BUILTINS} "RS_DEF(${LIB_NAME}_install)\n")

cmake/build-crates.cmake

@@ -1,33 +1,43 @@
-corrosion_import_crate(MANIFEST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/crates/rust-url/Cargo.toml NO_LINKER_OVERRIDE)
+set(RUST_STATICLIB_RS "${CMAKE_CURRENT_BINARY_DIR}/rust-staticlib.rs" CACHE INTERNAL "Path to the Rust staticlibs bundler source file" FORCE)
+set(RUST_STATICLIB_TOML "${CMAKE_CURRENT_BINARY_DIR}/Cargo.toml" CACHE INTERNAL "Path to the Rust staticlibs bundler Cargo.toml file" FORCE)
+configure_file("runtime/crates/staticlib-template/rust-staticlib.rs.in" "${RUST_STATICLIB_RS}" COPYONLY)
+
+# Add the debugmozjs feature for debug builds.
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(DEBUGMOZJS_FEATURE "\"debugmozjs\"")
+endif()
+configure_file("runtime/crates/staticlib-template/Cargo.toml.in" "${RUST_STATICLIB_TOML}")
 
 corrosion_import_crate(
         MANIFEST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/runtime/crates/Cargo.toml
-        NO_LINKER_OVERRIDE
-        CRATE_TYPES "staticlib"
-        IMPORTED_CRATES crates_list
+        CRATES "generate-bindings"
 )
-
-#list(REMOVE_ITEM crates_list "generate-bindings")
-foreach (crate IN LISTS crates_list)
-    if (crate STREQUAL "generate-bindings")
-        continue()
-    endif ()
-    add_dependencies("cargo-prebuild_${crate}" cargo-build_generate-bindings)
-endforeach ()
-
-message(STATUS "Imported crates: ${crates_list}")
-
-add_library(rust-glue STATIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/crates/jsapi-rs/cpp/jsglue.cpp)
-target_include_directories(rust-glue PRIVATE ${SM_INCLUDE_DIR})
-add_dependencies(cargo-prebuild_generate-bindings rust-glue)
-
-corrosion_set_env_vars(generate-bindings
-        LIBCLANG_PATH=/opt/homebrew/opt/llvm/lib
+corrosion_set_env_vars(generate_bindings
         SYSROOT=${WASI_SDK_PREFIX}/share/wasi-sysroot
         CXXFLAGS="${CMAKE_CXX_FLAGS}"
         BIN_DIR=${CMAKE_CURRENT_BINARY_DIR}
         SM_HEADERS=${SM_INCLUDE_DIR}
         RUST_LOG=bindgen
 )
 
-set_property(TARGET rust-url PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/crates/rust-url/)
+corrosion_import_crate(
+        MANIFEST_PATH ${RUST_STATICLIB_TOML}
+        CRATES "rust-staticlib"
+        NO_LINKER_OVERRIDE
+)
+
+add_dependencies("cargo-prebuild_rust_staticlib" cargo-build_generate_bindings)
+
+add_library(rust-glue ${CMAKE_CURRENT_SOURCE_DIR}/runtime/crates/jsapi-rs/cpp/jsglue.cpp)
+target_include_directories(rust-glue PRIVATE ${SM_INCLUDE_DIR})
+add_dependencies(rust_staticlib rust-glue)
+
+function(add_rust_lib name path)
+    add_library(${name} INTERFACE)
+    file(APPEND $CACHE{RUST_STATICLIB_TOML} "${name} = { path = \"${path}\" }\n")
+    string(REPLACE "-" "_" name ${name})
+    file(APPEND $CACHE{RUST_STATICLIB_RS} "pub use ${name};\n")
+endfunction()
+
+add_rust_lib("rust-url" "${CMAKE_CURRENT_SOURCE_DIR}/crates/rust-url")
+set_property(TARGET rust-url PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/crates/rust-url")

cmake/builtins.cmake

@@ -96,4 +96,4 @@ add_builtin(
     INCLUDE_DIRS
         runtime)
 
-add_rust_builtin(test-builtin)
+add_rust_builtin(test-builtin "${CMAKE_CURRENT_SOURCE_DIR}/runtime/crates/test-builtin")

cmake/spidermonkey.cmake

@@ -39,6 +39,6 @@ file(GLOB SM_OBJS ${SM_SOURCE_DIR}/lib/*.o)
 add_library(spidermonkey STATIC)
 target_sources(spidermonkey PRIVATE ${SM_OBJS} ${CMAKE_CURRENT_BINARY_DIR}/null.cpp)
 set_property(TARGET spidermonkey PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${SM_INCLUDE_DIR})
-target_link_libraries(spidermonkey PUBLIC ${SM_SOURCE_DIR}/lib/libjs_static.a ${SM_SOURCE_DIR}/lib/libjsrust.a)
+target_link_libraries(spidermonkey PUBLIC ${SM_SOURCE_DIR}/lib/libjs_static.a)
 
 add_compile_definitions("MOZ_JS_STREAMS")

componentize.sh componentize.sh.incomponentize.sh renamed to componentize.sh.in

@@ -5,15 +5,6 @@ license = "Apache-2.0 WITH LLVM-exception"
 edition = "2021"
 
 [lib]
-crate-type = ["staticlib"]
 
 [dependencies]
 url = "2.5.2"
-
-[profile.release]
-lto = true
-panic = 'abort'
-
-[profile.dev]
-lto = true
-panic = 'abort'

crates/rust-url/Cargo.toml

@@ -4,26 +4,28 @@ repository = "https://github.com/bytecodealliance/starlingmonkey"
 license = "MPL-2.0"
 authors = ["The StarlingMonkey project contributors", "The Servo Project Developers"]
 edition = "2021"
+resolver = "2"
 
 [workspace]
 members = [
     "jsapi-rs",
     "spidermonkey-rs",
     "starlingmonkey-rs",
     "generate-bindings",
-    "test-builtin",
 ]
 resolver = "2"
 
 [workspace.dependencies]
 jsapi-rs = { path = "jsapi-rs" }
 starlingmonkey-rs = { path = "starlingmonkey-rs" }
 spidermonkey-rs = { path = "spidermonkey-rs" }
+
 bindgen = { version = "0.69", default-features = false, features = [
     "runtime",
     "prettyplease",
     "experimental",
 ] }
+libc = "0.2"
 
 [profile.release]
 lto = true

runtime/crates/Cargo.lock

@@ -10,9 +10,3 @@ crate-type = ["staticlib"]
 
 [build-dependencies]
 bindgen.workspace = true
-
-[features]
-debugmozjs = []
-jitspew = []
-profilemozjs = []
-streams = []