Skip to content

Commit 3210966

Browse files
author
José Valim
committed
Do not propagate protocol consolidation to children
1 parent b93aae9 commit 3210966

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

lib/mix/lib/mix/project.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ defmodule Mix.Project do
8383
[build_embedded: config[:build_embedded],
8484
build_path: build_path(config),
8585
build_per_environment: config[:build_per_environment],
86+
consolidate_protocols: false,
8687
deps_path: deps_path(config)]
8788
end
8889

@@ -391,7 +392,6 @@ defmodule Mix.Project do
391392
[aliases: [],
392393
build_per_environment: true,
393394
build_embedded: false,
394-
consolidate_protocols: false,
395395
default_task: "run",
396396
deps: [],
397397
deps_path: "deps",

lib/mix/lib/mix/tasks/compile.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ defmodule Mix.Tasks.Compile do
7979

8080
defp consolidate_protocols? do
8181
config = Mix.Project.config
82-
config[:build_embedded] || config[:consolidate_protocols]
82+
Keyword.get(config, :consolidate_protocols, config[:build_embedded])
8383
end
8484

8585
@doc """

lib/mix/lib/mix/tasks/escript.build.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ defmodule Mix.Tasks.Escript.Build do
120120
|> Stream.concat
121121
|> prepare_beam_paths
122122

123-
if project[:build_embedded] || project[:consolidate_protocols] do
123+
if Keyword.get(project, :consolidate_protocols, project[:build_embedded]) do
124124
beam_paths =
125125
Path.wildcard(consolidated_path <> "/*")
126126
|> prepare_beam_paths(beam_paths)

0 commit comments

Comments
 (0)