summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorBjörn Gustavsson <bjorn@erlang.org>2019-08-28 12:51:41 +0200
committerBjörn Gustavsson <bjorn@erlang.org>2019-08-28 12:51:41 +0200
commit5583fa743b1f73763a54808523808fa0b236994b (patch)
tree5b9c1eb4e930a5fd6e411c0b14a3870077c81952 /Makefile.in
parent78f057f2e2855e51338b866a2cf482f9cb315043 (diff)
parentb1f5a4914b46899a43dc50e36da1b1d16cc191c0 (diff)
downloaderlang-5583fa743b1f73763a54808523808fa0b236994b.tar.gz
Merge branch 'maint'
* maint: scripts/build-otp: Enable compile server for Travis/Jenkins builds Don't use the compile server for PGO Teach erlc to use the compile server Update primary bootstrap Add erl_compiler_server Refactor the erl_compile module Clarify that digraphs are implemented using ETS tables
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in11
1 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 55decd8794..133ea0f4d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -338,7 +338,8 @@ endif
else
# Cross compiling
-all: cross_check_erl depend emulator libs start_scripts check_dev_rt_dep
+all: cross_check_erl depend build_erl_interface \
+ emulator libs start_scripts check_dev_rt_dep
endif
@@ -376,11 +377,17 @@ endif
# With all bootstraps we mean all bootstrapping that is done when
# the system is delivered in open source, the primary
# bootstrap is not included, it requires a pre built emulator...
-all_bootstraps: emulator \
+all_bootstraps: build_erl_interface emulator \
bootstrap_setup \
secondary_bootstrap_build secondary_bootstrap_copy \
tertiary_bootstrap_build tertiary_bootstrap_copy
+.PHONY: build_erl_interface
+
+build_erl_interface:
+ $(make_verbose)cd lib/erl_interface && \
+ ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
+ $(MAKE) $(TYPE)
#
# Use these targets when you want to use the erl and erlc
# binaries in your PATH instead of those created from the