GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Fix Android backend failing to build on Windows with n2

Browse source
This commit is contained in:
Damien Elmes 2023-11-08 13:31:35 +10:00
parent 2241d2fd9d
commit f9d5f422e4
4 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -2599,6 +2599,7 @@ dependencies = [
"anki_io", "anki_io",
"anyhow", "anyhow",
"camino", "camino",
"dunce",
"globset", "globset",
"itertools 0.11.0", "itertools 0.11.0",
"lazy_static", "lazy_static",

1
Cargo.toml
View file

@ -143,6 +143,7 @@ zip = { version = "0.6.6", default-features = false, features = ["deflate", "tim
zstd = { version = "0.13.0", features = ["zstdmt"] } zstd = { version = "0.13.0", features = ["zstdmt"] }
envy = "0.4.2" envy = "0.4.2"
dirs = "5.0.1" dirs = "5.0.1"
dunce = "1.0.4"
# Apply mild optimizations to our dependencies in dev mode, which among other things # Apply mild optimizations to our dependencies in dev mode, which among other things
# improves sha2 performance by about 21x. Opt 1 chosen due to # improves sha2 performance by about 21x. Opt 1 chosen due to

1
build/ninja_gen/Cargo.toml
View file

@ -11,6 +11,7 @@ rust-version.workspace = true
anki_io.workspace = true anki_io.workspace = true
anyhow.workspace = true anyhow.workspace = true
camino.workspace = true camino.workspace = true
dunce.workspace = true
globset.workspace = true globset.workspace = true
itertools.workspace = true itertools.workspace = true
lazy_static.workspace = true lazy_static.workspace = true

5
build/ninja_gen/src/git.rs
View file

@ -46,7 +46,10 @@ fn locate_git_head() -> Option<BuildInput> {
return Some(inputs![standard_path.to_string()]); return Some(inputs![standard_path.to_string()]);
} }
let mut folder = Utf8Path::new(".").canonicalize_utf8().unwrap(); let mut folder = Utf8PathBuf::from_path_buf(
dunce::canonicalize(Utf8Path::new(".").canonicalize().unwrap()).unwrap(),
)
.unwrap();
loop { loop {
let path = folder.join(".git").join("modules"); let path = folder.join(".git").join("modules");
if path.exists() { if path.exists() {