Skip to content

Commit

Permalink
other cc branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Be-ing committed Jan 30, 2024
1 parent 16a613e commit 8e99a05
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ versions = "6.1.0"
# Use a patched version of cc-rs that respects the rustc wrapper
# This should greatly speed up CI builds!
[patch.crates-io]
cc = { git = "https://github.com/Be-ing/cc-rs.git", branch="dont_override_apple_deployment_target" }
cc = { git = "https://github.com/Be-ing/cc-rs.git", branch="apple_deployment_target_api" }
2 changes: 1 addition & 1 deletion crates/cxx-qt-build/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ impl CxxQtBuilder {
// MinGW requires big-obj otherwise debug builds fail
builder.flag_if_supported("-Wa,-mbig-obj");
// macOS
builder.flag_if_supported(&format!("-mmacosx-version-min={}", macos_deployment_target));
builder.apple_deployment_target(&macos_deployment_target);
// Enable Qt Gui in C++ if the feature is enabled
#[cfg(feature = "qt_gui")]
builder.define("CXX_QT_GUI_FEATURE", None);
Expand Down
2 changes: 1 addition & 1 deletion crates/cxx-qt-lib/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ fn main() {
// GCC + Clang
builder.flag_if_supported("-std=c++17");
// macOS
builder.flag_if_supported(&format!("-mmacosx-version-min={}", macos_deployment_target));
builder.apple_deployment_target(&macos_deployment_target);
builder.file(&format!("{}/src/broken.cpp", env!("CARGO_MANIFEST_DIR")));
// MinGW requires big-obj otherwise debug builds fail
builder.flag_if_supported("-Wa,-mbig-obj");
Expand Down

0 comments on commit 8e99a05

Please sign in to comment.