Merge pull request #858 from n-k/main

MarcusDunn · web-flow · commit 266957a9649b · 2025-11-10T09:11:47.000-08:00
Fixed build for linux+vulkan when not using system vulkan SDK
diff --git a/llama-cpp-sys-2/build.rs b/llama-cpp-sys-2/build.rs
@@ -658,6 +658,11 @@ fn main() {
                 config.cxxflag("/FS");
             }
             TargetOs::Linux => {
+                // If we are not using system provided vulkan SDK, add vulkan libs for linking
+                if let Ok(vulkan_path) = env::var("VULKAN_SDK") {
+                    let vulkan_lib_path = Path::new(&vulkan_path).join("lib");
+                    println!("cargo:rustc-link-search={}", vulkan_lib_path.display());
+                }
                 println!("cargo:rustc-link-lib=vulkan");
             }
             _ => (),

Original file line number	Diff line number	Diff line change
`@@ -658,6 +658,11 @@ fn main() {`
`658`	`658`	`config.cxxflag("/FS");`
`659`	`659`	`}`
`660`	`660`	`TargetOs::Linux => {`
	`661`	`+ // If we are not using system provided vulkan SDK, add vulkan libs for linking`
	`662`	`+ if let Ok(vulkan_path) = env::var("VULKAN_SDK") {`
	`663`	`+ let vulkan_lib_path = Path::new(&vulkan_path).join("lib");`
	`664`	`+ println!("cargo:rustc-link-search={}", vulkan_lib_path.display());`
	`665`	`+ }`
`661`	`666`	`println!("cargo:rustc-link-lib=vulkan");`
`662`	`667`	`}`
`663`	`668`	`_ => (),`