Skip to content

Commit 83356b7

Browse files
committed
Auto merge of #104361 - vladimir-ea:watchos_fix_linking, r=oli-obk
[watchos] Dynamic linking is not allowed for watchos targets Dynamic linking of all apple targets was (re-) enabled in PR #100636. However, dynamic linking is not allowed on WatchOS so this broke the build of standard library for WatchOS. This change disables dynamic linking for WatchOS non-simulator targets.
2 parents b6097f2 + db99a89 commit 83356b7

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

compiler/rustc_target/src/spec/arm64_32_apple_watchos.rs

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ pub fn target() -> Target {
1212
features: "+neon,+fp-armv8,+apple-a7".into(),
1313
max_atomic_width: Some(128),
1414
forces_embed_bitcode: true,
15+
dynamic_linking: false,
16+
position_independent_executables: true,
1517
// These arguments are not actually invoked - they just have
1618
// to look right to pass App Store validation.
1719
bitcode_llvm_cmdline: "-triple\0\

compiler/rustc_target/src/spec/armv7k_apple_watchos.rs

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ pub fn target() -> Target {
1212
features: "+v7,+vfp4,+neon".into(),
1313
max_atomic_width: Some(64),
1414
forces_embed_bitcode: true,
15+
dynamic_linking: false,
16+
position_independent_executables: true,
1517
// These arguments are not actually invoked - they just have
1618
// to look right to pass App Store validation.
1719
bitcode_llvm_cmdline: "-triple\0\

0 commit comments

Comments
 (0)