Skip to content

Commit

Permalink
Remove the link Cargo feature
Browse files Browse the repository at this point in the history
  • Loading branch information
madsmtm committed May 29, 2024
1 parent b5b39f6 commit 28dba19
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,15 @@ By @stefnotch in [#5410](https://github.com/gfx-rs/wgpu/pull/5410)

- Avoid introducing spurious features for optional dependencies. By @bjorn3 in [#5691](https://github.com/gfx-rs/wgpu/pull/5691)

#### Metal
- Removed the `link` Cargo feature.

This was used to allow weakly linking frameworks. This can be achieved with putting something like the following in your `.cargo/config.toml` instead:
```toml
[target.'cfg(target_vendor = "apple")']
rustflags = ["-C", "link-args=-weak_framework Metal -weak_framework QuartzCore -weak_framework CoreGraphics"]
```

### Bug Fixes

### General
Expand Down
5 changes: 0 additions & 5 deletions wgpu-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,12 @@ ignored = ["cfg_aliases"]
[lib]

[features]
default = ["link"]

## Log all API entry points at info instead of trace level.
api_log_info = []

## Log resource lifecycle management at info instead of trace level.
resource_log_info = []

## Use static linking for libraries. Disable to manually link. Enabled by default.
link = ["hal/link"]

## Support the Renderdoc graphics debugger:
## <https://renderdoc.org/>
renderdoc = ["hal/renderdoc"]
Expand Down
2 changes: 0 additions & 2 deletions wgpu-hal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ ignored = ["cfg_aliases"]
[lib]

[features]
default = ["link"]
metal = ["naga/msl-out", "dep:block"]
vulkan = [
"naga/spv-out",
Expand Down Expand Up @@ -76,7 +75,6 @@ windows_rs = ["dep:gpu-allocator"]
dxc_shader_compiler = ["dep:hassle-rs"]
renderdoc = ["dep:libloading", "dep:renderdoc-sys"]
fragile-send-sync-non-atomic-wasm = ["wgt/fragile-send-sync-non-atomic-wasm"]
link = ["metal/link"]
# Panic when running into an out-of-memory error (for debugging purposes).
#
# Only affects the d3d12 and vulkan backends.
Expand Down
2 changes: 1 addition & 1 deletion wgpu-hal/src/metal/surface.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use objc::{
use parking_lot::{Mutex, RwLock};

#[cfg(target_os = "macos")]
#[cfg_attr(feature = "link", link(name = "QuartzCore", kind = "framework"))]
#[link(name = "QuartzCore", kind = "framework")]
extern "C" {
#[allow(non_upper_case_globals)]
static kCAGravityTopLeft: *mut Object;
Expand Down

0 comments on commit 28dba19

Please sign in to comment.