mirrors/ZLUDA
0
0
Fork 0
mirror of https://github.com/vosen/ZLUDA.git synced 2025-08-03 14:50:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix reported build errors (#178)

Browse source
This commit is contained in:
Andrzej Janik 2024-03-17 01:32:48 +01:00 • committed by GitHub
commit f47a93a951
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 55 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

80
ext/llvm-sys.rs/build.rs vendored
View file

@ -3,7 +3,7 @@ extern crate convert_case;
use convert_case::{Case, Casing, StateConverter}; use convert_case::{Case, Casing, StateConverter};
use std::{ use std::{
env, env, io,
path::PathBuf, path::PathBuf,
process::{Command, Stdio}, process::{Command, Stdio},
}; };
@ -17,8 +17,9 @@ fn main() {
.map(|comp| comp.from_case(Case::Snake)); .map(|comp| comp.from_case(Case::Snake));
let msvc = is_msvc(); let msvc = is_msvc();
let (llvm_dir, additonal_cmake_file) = get_llvm_dir(); let (llvm_dir, additonal_cmake_file) = get_llvm_dir();
let out_dir = build_cmake_targets(llvm_components.clone(), llvm_dir, additonal_cmake_file); let (cmake_profile, out_dir) =
emit_compile_and_linking_information(llvm_components, out_dir, msvc) build_cmake_targets(llvm_components.clone(), llvm_dir, additonal_cmake_file);
emit_compile_and_linking_information(llvm_components, cmake_profile, out_dir, msvc)
} }
fn is_msvc() -> bool { fn is_msvc() -> bool {
@ -41,11 +42,14 @@ fn build_cmake_targets<'a>(
components: impl Iterator<Item = StateConverter<'a, &'static str>>, components: impl Iterator<Item = StateConverter<'a, &'static str>>,
llvm_dir: PathBuf, llvm_dir: PathBuf,
additional_cmake_file: PathBuf, additional_cmake_file: PathBuf,
) -> PathBuf { ) -> (String, PathBuf) {
let mut cmake = Config::new(llvm_dir); let mut cmake = Config::new(llvm_dir);
use_ninja(&mut cmake); use_ninja(&mut cmake);
cmake cmake
.always_configure(true) .always_configure(true)
// Should be detected automatically, but we have reports of
// LLVM fiding ZLIB on Windows and then failing to link it
.define("LLVM_ENABLE_ZLIB", "OFF")
.define("LLVM_ENABLE_TERMINFO", "OFF") .define("LLVM_ENABLE_TERMINFO", "OFF")
.define("LLVM_BUILD_TOOLS", "OFF") .define("LLVM_BUILD_TOOLS", "OFF")
.define("LLVM_TARGETS_TO_BUILD", "") .define("LLVM_TARGETS_TO_BUILD", "")
@ -57,7 +61,10 @@ fn build_cmake_targets<'a>(
.build_target(&format!("LLVM{}", component.to_case(Case::Pascal))) .build_target(&format!("LLVM{}", component.to_case(Case::Pascal)))
.build(); .build();
} }
cmake.build_target("llvm-config").build() (
cmake.get_profile().to_string(),
cmake.build_target("llvm-config").build(),
)
} }
fn use_ninja(cmake: &mut Config) { fn use_ninja(cmake: &mut Config) {
@ -76,30 +83,26 @@ fn use_ninja(cmake: &mut Config) {
} }
fn emit_compile_and_linking_information<'a>( fn emit_compile_and_linking_information<'a>(
llvm_components: impl Iterator<Item = StateConverter<'a, &'static str>>, llvm_components: impl Iterator<Item = StateConverter<'a, &'static str>> + Clone,
cmake_profile: String,
out_dir: PathBuf, out_dir: PathBuf,
is_msvc: bool, is_msvc: bool,
) { ) {
let mut llvm_config_path = out_dir.clone(); // MSBuild uses didfferent output path from ninja or Makefile.
llvm_config_path.push("build"); // Not sure how to query CMake about it, so we just try once with
llvm_config_path.push("bin"); // ninja/Makefile path and then once with MSBuild path
llvm_config_path.push("llvm-config"); let llvm_config_output = execute_llvm_config(
let mut llvm_config_cmd = Command::new(&llvm_config_path); &out_dir,
llvm_config_cmd.args([ &["build", "bin", "llvm-config"],
"--cxxflags", llvm_components.clone(),
"--ldflags", )
"--libdir", .or_else(|_| {
"--libnames", execute_llvm_config(
"--system-libs", &out_dir,
"--link-static", &["build", &*cmake_profile, "bin", "llvm-config"],
]); llvm_components,
for component in llvm_components { )
llvm_config_cmd.arg(&component.to_case(Case::Flat)); })
}
let llvm_config_output = llvm_config_cmd
.stdin(Stdio::null())
.stderr(Stdio::null())
.output()
.unwrap(); .unwrap();
if !llvm_config_output.status.success() { if !llvm_config_output.status.success() {
panic!() panic!()
@ -138,3 +141,28 @@ fn emit_compile_and_linking_information<'a>(
println!("cargo:rustc-link-lib=stdc++"); println!("cargo:rustc-link-lib=stdc++");
} }
} }
fn execute_llvm_config<'a>(
out_dir: &PathBuf,
llvm_config_exe_relative: &[&str],
llvm_components: impl Iterator<Item = StateConverter<'a, &'static str>>,
) -> io::Result<std::process::Output> {
let mut llvm_config_path = out_dir.clone();
llvm_config_path.extend(llvm_config_exe_relative);
let mut llvm_config_cmd = Command::new(&llvm_config_path);
llvm_config_cmd.args([
"--cxxflags",
"--ldflags",
"--libdir",
"--libnames",
"--system-libs",
"--link-static",
]);
for component in llvm_components {
llvm_config_cmd.arg(&component.to_case(Case::Flat));
}
llvm_config_cmd
.stdin(Stdio::null())
.stderr(Stdio::null())
.output()
}