Skip to content

Fix #5470#5474

Merged
rgrinberg merged 1 commit intomainfrom
ps/rr/test__add_regression_for_5470
Feb 22, 2022
Merged

Fix #5470#5474
rgrinberg merged 1 commit intomainfrom
ps/rr/test__add_regression_for_5470

Conversation

@rgrinberg
Copy link
Copy Markdown
Member

We used to look up gmake before make, but it seems that we accidentally dropped this behavior in 3.0

@rgrinberg rgrinberg added this to the 3.0.3 milestone Feb 22, 2022
Copy link
Copy Markdown
Collaborator

@snowleopard snowleopard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks!

val which : path:Path.t list -> string -> Path.t option

(** "make" program *)
val make : path:Path.t list -> Path.t option
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this just unused?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it was. If we had a warning that this code remain unused, we probably would have caught the bug in the PR that introduced it.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, sad that we don't have it.

@rgrinberg rgrinberg linked an issue Feb 22, 2022 that may be closed by this pull request
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

ps-id: 9347ADDB-784C-4AC6-906E-870649C00D3E
@rgrinberg rgrinberg force-pushed the ps/rr/test__add_regression_for_5470 branch from 31c3c03 to a29c291 Compare February 22, 2022 01:21
@rgrinberg rgrinberg merged commit a29c291 into main Feb 22, 2022
@rgrinberg rgrinberg deleted the ps/rr/test__add_regression_for_5470 branch February 22, 2022 01:21
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Mar 1, 2022
…e-rpc, dune-rpc-lwt, dune-private-libs, dune-glob, dune-configurator, dune-build-info and dune-action-plugin (3.0.3)

CHANGES:

- Do not enable warnings 63-70 by default (ocaml/dune#5476, fixes ocaml/dune#5464, @rgrinberg)

- Allow %{read-lines} to introduce dynamic dependencies like %{read}. (ocaml/dune#5440,
  @anmonteiro)

- Look up `gmake` before `make` (ocaml/dune#5474, fixes ocaml/dune#5470, @rgrinberg)

- Handle empty output from `getconf` (ocaml/dune#5473 fixes ocaml/dune#5471, @mndrix)

- Depend on any provided `foreign_archives` for ctypes stub generation (ocaml/dune#5475,
  @mbacarella)
> EOF

$ PATH="$PWD/make:$PATH" dune build @make --force
make
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rgrinberg The test doesn't work if gmake is present in $PATH.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

%{make} always invokes make, not gmake anymore

3 participants