File tree Expand file tree Collapse file tree 2 files changed +10
-2
lines changed Expand file tree Collapse file tree 2 files changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -61,7 +61,11 @@ fn install_android_deps() {
61
61
let target = format ! ( "{}-android" , target_arch) ;
62
62
let vcpkg_root = std:: env:: var ( "VCPKG_ROOT" ) . unwrap ( ) ;
63
63
let mut path: std:: path:: PathBuf = vcpkg_root. into ( ) ;
64
- path. push ( "installed" ) ;
64
+ if let Ok ( vcpkg_root) = std:: env:: var ( "VCPKG_INSTALLED_ROOT" ) {
65
+ path = vcpkg_root. into ( ) ;
66
+ } else {
67
+ path. push ( "installed" ) ;
68
+ }
65
69
path. push ( target) ;
66
70
println ! (
67
71
"{}" ,
Original file line number Diff line number Diff line change @@ -55,7 +55,11 @@ fn link_vcpkg(mut path: PathBuf, name: &str) -> PathBuf {
55
55
target = target. replace ( "x64" , "x86" ) ;
56
56
}
57
57
println ! ( "cargo:info={}" , target) ;
58
- path. push ( "installed" ) ;
58
+ if let Ok ( vcpkg_root) = std:: env:: var ( "VCPKG_INSTALLED_ROOT" ) {
59
+ path = vcpkg_root. into ( ) ;
60
+ } else {
61
+ path. push ( "installed" ) ;
62
+ }
59
63
path. push ( target) ;
60
64
println ! (
61
65
"{}" ,
You can’t perform that action at this time.
0 commit comments