diff --git a/.cargo/config b/.cargo/config
new file mode 100644
index 0000000000..148f915d26
--- /dev/null
+++ b/.cargo/config
@@ -0,0 +1,4 @@
+[build]
+# Currently there's an issue where the Example CPU runner fails without
+# `-C prefer-dynamic`.
+rustflags = "-C prefer-dynamic"
diff --git a/Cargo.toml b/Cargo.toml
index 378ffd683e..e52bf9f3f5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,4 +21,5 @@ codegen-units = 16
 
 [patch.crates-io]
 spirv-std = { path = "./crates/spirv-std" }
+spirv-std-macros = { path = "./crates/spirv-std-macros" }
 glam = { git = "https://github.com/bitshifter/glam-rs.git", rev ="b3e94fb" }
diff --git a/examples/runners/cpu/Cargo.toml b/examples/runners/cpu/Cargo.toml
index ba26a1befd..91c050ef78 100644
--- a/examples/runners/cpu/Cargo.toml
+++ b/examples/runners/cpu/Cargo.toml
@@ -6,10 +6,6 @@ edition = "2018"
 license = "MIT OR Apache-2.0"
 publish = false
 
-[[bin]]
-name = "example-runner-cpu"
-test = false
-
 [dependencies]
 minifb = "0.19.2"
 # bring in the shader as natively compiled code