fix(build): resolve Windows library paths from the crate directory (#2616)
EasyTier Core / pre_job (push) Canceled after 0s
EasyTier Core / build_web (push) Canceled after 0s
EasyTier Core / build (freebsd-13.2-x86_64, 13.2, ubuntu-24.04, x86_64-unknown-freebsd) (push) Canceled after 0s
EasyTier Core / build (linux-aarch64, ubuntu-24.04-arm, aarch64-unknown-linux-musl) (push) Canceled after 0s
EasyTier Core / build (linux-arm, ubuntu-24.04, arm-unknown-linux-musleabi) (push) Canceled after 0s
EasyTier Core / build (linux-armhf, ubuntu-24.04, arm-unknown-linux-musleabihf) (push) Canceled after 0s
EasyTier Core / build (linux-armv7, ubuntu-24.04, armv7-unknown-linux-musleabi) (push) Canceled after 0s
EasyTier Core / build (linux-armv7hf, ubuntu-24.04, armv7-unknown-linux-musleabihf) (push) Canceled after 0s
EasyTier Core / build (linux-loongarch64, ubuntu-24.04, loongarch64-unknown-linux-musl) (push) Canceled after 0s
EasyTier Core / build (linux-mips, ubuntu-24.04, mips-unknown-linux-musl) (push) Canceled after 0s
EasyTier Core / build (linux-mipsel, ubuntu-24.04, mipsel-unknown-linux-musl) (push) Canceled after 0s
EasyTier Core / build (linux-riscv64, ubuntu-24.04, riscv64gc-unknown-linux-musl) (push) Canceled after 0s
EasyTier Core / build (linux-x86_64, ubuntu-24.04, x86_64-unknown-linux-musl) (push) Canceled after 0s
EasyTier Core / build (macos-aarch64, macos-latest, aarch64-apple-darwin) (push) Canceled after 0s
EasyTier Core / build (macos-x86_64, macos-latest, x86_64-apple-darwin) (push) Canceled after 0s
EasyTier Core / build (windows-arm64, windows-11-arm, aarch64-pc-windows-msvc) (push) Canceled after 0s
EasyTier Core / build (windows-i686, windows-latest, i686-pc-windows-msvc) (push) Canceled after 0s
EasyTier Core / build (windows-x86_64, windows-latest, x86_64-pc-windows-msvc) (push) Canceled after 0s
EasyTier Core / build_magisk (push) Canceled after 0s
EasyTier Core / core-result (push) Canceled after 0s
EasyTier GUI / pre_job (push) Canceled after 0s
EasyTier GUI / build-gui (linux-aarch64, aarch64-unknown-linux-gnu, ubuntu-24.04-arm, aarch64-unknown-linux-musl) (push) Canceled after 0s
EasyTier GUI / build-gui (linux-x86_64, x86_64-unknown-linux-gnu, ubuntu-24.04, x86_64-unknown-linux-musl) (push) Canceled after 0s
EasyTier GUI / build-gui (macos-aarch64, aarch64-apple-darwin, macos-latest, aarch64-apple-darwin) (push) Canceled after 0s
EasyTier GUI / build-gui (macos-x86_64, x86_64-apple-darwin, macos-latest, x86_64-apple-darwin) (push) Canceled after 0s
EasyTier GUI / build-gui (windows-arm64, aarch64-pc-windows-msvc, windows-11-arm, aarch64-pc-windows-msvc) (push) Canceled after 0s
EasyTier GUI / build-gui (windows-i686, i686-pc-windows-msvc, windows-latest, i686-pc-windows-msvc) (push) Canceled after 0s
EasyTier GUI / build-gui (windows-x86_64, x86_64-pc-windows-msvc, windows-latest, x86_64-pc-windows-msvc) (push) Canceled after 0s
EasyTier GUI / gui-result (push) Canceled after 0s
EasyTier Mobile / pre_job (push) Canceled after 0s
EasyTier Mobile / build-mobile (aarch64, aarch64-linux-android) (push) Canceled after 0s
EasyTier Mobile / build-mobile (armv7, armv7-linux-androideabi) (push) Canceled after 0s
EasyTier Mobile / build-mobile (i686, i686-linux-android) (push) Canceled after 0s
EasyTier Mobile / build-mobile (x86_64, x86_64-linux-android) (push) Canceled after 0s
EasyTier Mobile / mobile-result (push) Canceled after 0s
EasyTier Test / pre_job (push) Canceled after 0s
EasyTier Test / Run linters & check (push) Canceled after 0s
EasyTier Test / Build test (push) Canceled after 0s
EasyTier Test / Test (easytier) (push) Canceled after 0s
EasyTier Test / Test (three_node) (push) Canceled after 0s
EasyTier Test / Test (three_node::subnet_proxy_three_node_test) (push) Canceled after 0s
EasyTier Test / test (push) Canceled after 0s
EasyTier JavaScript Hosts / check (push) Canceled after 0s
ohos / pre_job (push) Canceled after 0s
ohos / ohos (push) Canceled after 0s

When another project uses easytier as a dependency on Windows, linking can fail because the build script emits relative native-library search paths such as easytier/third_party/x86_64/. These paths depend on the consuming project's directory layout instead of locating the libraries bundled with the easytier crate.

Build an absolute search path from CARGO_MANIFEST_DIR, followed by third_party and the target architecture directory (x86_64, i686, or arm64). This lets the linker locate the bundled libraries regardless of where the consuming project is built.
This commit is contained in:
Burning_TNT
2026-09-30 00:48:08 +08:00
committed by GitHub
parent 3da349f4ee
commit cea877ca77
+12 -6
View File
@@ -9,14 +9,20 @@ impl WindowsBuild {
pub fn check_for_win() {
// add third_party dir to link search path
let target = std::env::var("TARGET").unwrap_or_default();
if target.contains("x86_64") {
println!("cargo:rustc-link-search=native=easytier/third_party/x86_64/");
let variant = if target.contains("x86_64") {
"x86_64"
} else if target.contains("i686") {
println!("cargo:rustc-link-search=native=easytier/third_party/i686/");
"i686"
} else if target.contains("aarch64") {
println!("cargo:rustc-link-search=native=easytier/third_party/arm64/");
}
"arm64"
} else {
return;
};
let mut path = std::path::PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap());
path.push("third_party");
path.push(variant);
println!("cargo:rustc-link-search=native={}", path.to_str().unwrap());
}
}