Skip to content

Commit 9c736e9

Browse files
authored
Fix MacOS tests (#6)
1 parent a70ff96 commit 9c736e9

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/cargo_cmd.erl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,9 @@ patch_on_windows(Cmd) ->
122122
env() ->
123123
case os:type() of
124124
{unix, darwin} ->
125-
[{"RUSTFLAGS", "--codegen 'link-args=-flat_namespace -undefined suppress'"}];
125+
% https://github.com/rust-lang/cargo/issues/3287
126+
% https://github.com/rust-lang/rust/pull/36574
127+
[{"RUSTFLAGS", "--codegen link-arg=-flat_namespace --codegen link-arg=-undefined --codegen link-arg=suppress"}];
126128
_ ->
127129
[]
128130
end.

test/cargo_SUITE.erl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,8 @@ basic_tests_bin(ExeName, Artifact) ->
9696
filename:basename(cargo_artifact:executable(Artifact))
9797
)
9898
),
99-
?assertEqual(
100-
[cargo_artifact:executable(Artifact)],
101-
cargo_artifact:filenames(Artifact)
102-
).
99+
?assert(lists:member(cargo_artifact:executable(Artifact),
100+
cargo_artifact:filenames(Artifact))).
103101

104102

105103
basic_tests(Name, Version, Artifact) ->

0 commit comments

Comments
 (0)