Skip to content

Commit 3a4cdb5

Browse files
Merge #2379
2379: fix metal build r=grovesNL a=stuartcarnie Fixes metal compilation issue: metallib: Invalid bitcode file! PR checklist: - [ ] `make` succeeds (on *nix) - a few failures due to rust-lang/rust#52801 - [x] `make reftests` succeeds - [x] tested examples with the following backends: **metal** - [x] `rustfmt` run on changed code Co-authored-by: Stuart Carnie <[email protected]>
2 parents 243939a + 63fc9a8 commit 3a4cdb5

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

src/backend/metal/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ fn main() {
5555
out_path.set_extension("air");
5656

5757
let status = Command::new("xcrun")
58-
.args(&["-sdk", sdk_name, "metal"])
58+
.args(&["-sdk", sdk_name, "metal", "-c"])
5959
.arg(shader_path.as_os_str())
6060
.arg("-o")
6161
.arg(out_path.as_os_str())

src/backend/metal/shaders/blit.metal

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "macros.metal"
1+
#include "macros.h"
22
#include <metal_stdlib>
33
using namespace metal;
44

src/backend/metal/shaders/clear.metal

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "macros.metal"
1+
#include "macros.h"
22
#include <metal_stdlib>
33
using namespace metal;
44

0 commit comments

Comments
 (0)