Skip to content

Commit

Permalink
Remove no longer necessary MacOS RUSTFLAGS hack (#9)
Browse files Browse the repository at this point in the history
The two PRs mentioned have since been merged, this can now be dropped.
  • Loading branch information
lrascao committed Jul 5, 2021
1 parent f2a2ac0 commit 99c224d
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions src/cargo_cmd.erl
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ exec(Command, Path) ->
{line, ?MAX_LINE_LENGTH},
use_stdio,
hide,
eof,
{env, env()}
eof
],

Command1 = lists:flatten(patch_on_windows(Command)),
Expand Down Expand Up @@ -118,20 +117,6 @@ patch_on_windows(Cmd) ->
Cmd
end.

-spec env() -> [{string(), string()}].
env() ->
case os:type() of
{unix, darwin} ->
% https://github.com/rust-lang/cargo/issues/3287
% https://github.com/rust-lang/rust/pull/36574
[
{"RUSTFLAGS",
"--codegen link-arg=-flat_namespace --codegen link-arg=-undefined --codegen link-arg=suppress"}
];
_ ->
[]
end.

% Ignore dialyzer warnings for finalize and handle_output as the spec
% for jsx:decode/2 is broken (does not include incomplete and with_tail)
-dialyzer([
Expand Down

0 comments on commit 99c224d

Please sign in to comment.