Skip to content

Commit 34e7489

Browse files
committed
fix: apple build on multi definition flag
1 parent b8fc365 commit 34e7489

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

.cargo/config.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ rustflags = [
66
"tokio_unstable",
77
"-C",
88
"force-frame-pointers=yes",
9-
"-C",
10-
"link-arg=-Wl,--allow-multiple-definition"
9+
# This is needed for musl
10+
# "-C",
11+
# "link-arg=-Wl,--allow-multiple-definition"
1112
]
1213

1314
# [unstable]

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
env:
118118
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
119119
BUILD_MANIFEST_NAME: target/distrib/${{ join(matrix.targets, '-') }}-dist-manifest.json
120-
RUSTFLAGS: "--cfg tracing_unstable --cfg tokio_unstable -C force-frame-pointers=yes -C link-arg=-Wl,--allow-multiple-definition"
120+
RUSTFLAGS: "--cfg tracing_unstable --cfg tokio_unstable -C force-frame-pointers=yes"
121121
steps:
122122
- name: enable windows longpaths
123123
run: |

0 commit comments

Comments
 (0)