From 19b163d77d53456c0f4db9d3636a5c28b3e8c5ba Mon Sep 17 00:00:00 2001 From: nia Date: Fri, 11 Sep 2020 17:07:24 +0200 Subject: [PATCH 1/2] Use 'gmake' instead of 'make' when compiling deps on NetBSD There are basically two implementations of BSD make now, the NetBSD one (also used by FreeBSD, available as 'bmake' on Linux), and the OpenBSD one. --- lib/mix/lib/mix/tasks/deps.compile.ex | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/mix/lib/mix/tasks/deps.compile.ex b/lib/mix/lib/mix/tasks/deps.compile.ex index 6e0f4a11fa8..55cce97b5d6 100644 --- a/lib/mix/lib/mix/tasks/deps.compile.ex +++ b/lib/mix/lib/mix/tasks/deps.compile.ex @@ -15,8 +15,8 @@ defmodule Mix.Tasks.Deps.Compile do * `mix.exs` - invokes `mix compile` * `rebar.config` - invokes `rebar compile` * `Makefile.win`- invokes `nmake /F Makefile.win` (only on Windows) - * `Makefile` - invokes `gmake` on FreeBSD and OpenBSD, invokes `make` - on any other operating system (except on Windows) + * `Makefile` - invokes `gmake` on FreeBSD, NetBSD, and OpenBSD, invokes + `make` on any other operating system (except on Windows) The compilation can be customized by passing a `compile` option in the dependency: @@ -259,7 +259,7 @@ defmodule Mix.Tasks.Deps.Compile do {:win32, _} when makefile_win? -> "nmake /F Makefile.win" - {:unix, type} when type in [:freebsd, :openbsd] -> + {:unix, type} when type in [:freebsd, :netbsd, :openbsd] -> "gmake" _ -> From 696b6473e27b7afc1cc8312079916f117d94cca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 11 Sep 2020 18:27:20 +0200 Subject: [PATCH 2/2] Apply suggestions from code review --- lib/mix/lib/mix/tasks/deps.compile.ex | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/mix/lib/mix/tasks/deps.compile.ex b/lib/mix/lib/mix/tasks/deps.compile.ex index 55cce97b5d6..41e8bc759a5 100644 --- a/lib/mix/lib/mix/tasks/deps.compile.ex +++ b/lib/mix/lib/mix/tasks/deps.compile.ex @@ -15,8 +15,8 @@ defmodule Mix.Tasks.Deps.Compile do * `mix.exs` - invokes `mix compile` * `rebar.config` - invokes `rebar compile` * `Makefile.win`- invokes `nmake /F Makefile.win` (only on Windows) - * `Makefile` - invokes `gmake` on FreeBSD, NetBSD, and OpenBSD, invokes - `make` on any other operating system (except on Windows) + * `Makefile` - invokes `gmake` on DragonFlyBSD, FreeBSD, NetBSD, and OpenBSD, + invokes `make` on any other operating system (except on Windows) The compilation can be customized by passing a `compile` option in the dependency: @@ -259,7 +259,7 @@ defmodule Mix.Tasks.Deps.Compile do {:win32, _} when makefile_win? -> "nmake /F Makefile.win" - {:unix, type} when type in [:freebsd, :netbsd, :openbsd] -> + {:unix, type} when type in [:dragonfly, :freebsd, :netbsd, :openbsd] -> "gmake" _ ->