diff --git a/crates/bender-slang/CMakeLists.txt b/crates/bender-slang/CMakeLists.txt index d3270214..4b798ef1 100644 --- a/crates/bender-slang/CMakeLists.txt +++ b/crates/bender-slang/CMakeLists.txt @@ -6,7 +6,7 @@ include(FetchContent) FetchContent_Declare( slang GIT_REPOSITORY https://github.com/MikePopoloski/slang.git - GIT_TAG v10.0 + GIT_TAG v11.0 GIT_SHALLOW TRUE ) FetchContent_MakeAvailable(slang) diff --git a/crates/bender-slang/build.rs b/crates/bender-slang/build.rs index a9228691..6d056aed 100644 --- a/crates/bender-slang/build.rs +++ b/crates/bender-slang/build.rs @@ -127,14 +127,15 @@ fn main() { println!("cargo:rustc-link-lib=static=svlang"); // Link the additional libraries based on build profile. - let (fmt_lib, mimalloc_lib) = match (target_env.as_str(), build_profile.as_str()) { - ("msvc", _) => ("fmt", "mimalloc"), - (_, "debug") => ("fmtd", "mimalloc-debug"), - _ => ("fmt", "mimalloc"), + // Slang v11 bundles mimalloc directly into libsvlang.a (via mimalloc-obj), + // so only fmt needs an explicit link line. + let fmt_lib = match (target_env.as_str(), build_profile.as_str()) { + ("msvc", _) => "fmt", + (_, "debug") => "fmtd", + _ => "fmt", }; println!("cargo:rustc-link-lib=static={fmt_lib}"); - println!("cargo:rustc-link-lib=static={mimalloc_lib}"); if target_os == "windows" { println!("cargo:rustc-link-lib=advapi32"); diff --git a/crates/bender-slang/cpp/rewriter.cpp b/crates/bender-slang/cpp/rewriter.cpp index 042ea211..e2aaf717 100644 --- a/crates/bender-slang/cpp/rewriter.cpp +++ b/crates/bender-slang/cpp/rewriter.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2025 ETH Zurich // Tim Fischer -#include "slang/syntax/SyntaxVisitor.h" +#include "slang/syntax/SyntaxRewriter.h" #include "slang_bridge.h" #include