TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

windows: Try building inside OUT_DIR?

Browse source
This commit is contained in:
Blaž Hrastnik 2021-07-12 00:44:14 +09:00
parent dd2903ff10
commit c8dc9b64dd
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
helix-syntax/build.rs
View file

@ -7,7 +7,8 @@ use std::sync::mpsc::channel;
fn collect_tree_sitter_dirs(ignore: &[String]) -> Vec<String> { fn collect_tree_sitter_dirs(ignore: &[String]) -> Vec<String> {
let mut dirs = Vec::new(); let mut dirs = Vec::new();
for entry in fs::read_dir("languages").unwrap().flatten() { let path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("languages");
for entry in fs::read_dir(path).unwrap().flatten() {
let path = entry.path(); let path = entry.path();
let dir = path.file_name().unwrap().to_str().unwrap().to_string(); let dir = path.file_name().unwrap().to_str().unwrap().to_string();
if !ignore.contains(&dir) { if !ignore.contains(&dir) {
@ -54,13 +55,14 @@ fn build_library(src_path: &Path, language: &str) -> Result<()> {
if !recompile { if !recompile {
return Ok(()); return Ok(());
} }
let build_dir = std::env::var("OUT_DIR").unwrap();
let mut config = cc::Build::new(); let mut config = cc::Build::new();
config.cpp(true).opt_level(2).cargo_metadata(false); config.cpp(true).opt_level(2).cargo_metadata(false);
// .target(BUILD_TARGET) // .target(BUILD_TARGET)
// .host(BUILD_TARGET); // .host(BUILD_TARGET);
let compiler = config.get_compiler(); let compiler = config.get_compiler();
let mut command = Command::new(compiler.path()); let mut command = Command::new(compiler.path());
command.current_dir(build_dir);
for (key, value) in compiler.env() { for (key, value) in compiler.env() {
command.env(key, value); command.env(key, value);
} }
@ -185,7 +187,10 @@ fn build_dir(dir: &str, language: &str) {
std::process::exit(1); std::process::exit(1);
} }
let path = Path::new("languages").join(dir).join("src"); let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
.join("languages")
.join(dir)
.join("src");
build_library(&path, language).unwrap(); build_library(&path, language).unwrap();
} }