Skip to content

Commit 855840e

Browse files
committed
Restore the cargo:rustc-cdylib-link-arg
Not having it causes link error when building on macOs The CI don't catch that because we define the DYLD_FRAMEWORK_PATH env variable
1 parent c5aa4e8 commit 855840e

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

77
## [Unreleased]
88

9+
## 0.2.11 2023-11-03 (qttype only)
10+
11+
- reenable `cargo:rustc-cdylib-link-arg=-Wl,-rpath,` command even if it is depracated as it broke people's build
12+
913
## 0.2.10 2023-11-03
1014

1115
- qttypes: detect MSVC and MinGW incompatibilities

qttypes/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "qttypes"
3-
version = "0.2.10"
3+
version = "0.2.11"
44
edition = "2018"
55
authors = ["Olivier Goffart <olivier.goffart@slint.dev>"]
66
build = "build.rs"

qttypes/build.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,9 @@ fn main() {
220220
report_error(&format!("Rust target '{}' is not compatible with Qt mkspec '{spec}'. Mixing MinGW and MSVC is not allowed.", std::env::var_os("TARGET").unwrap_or_default().to_string_lossy()));
221221
}
222222
}
223-
/* https://github.com/rust-lang/cargo/issues/9562
224223
if std::env::var("CARGO_CFG_TARGET_FAMILY").as_ref().map(|s| s.as_ref()) == Ok("unix") {
225224
println!("cargo:rustc-cdylib-link-arg=-Wl,-rpath,{}", &qt_library_path);
226-
} */
225+
}
227226

228227
println!("cargo:rustc-link-search{}={}", macos_lib_search, &qt_library_path);
229228

0 commit comments

Comments
 (0)