summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorRickard Green <rickard@erlang.org>2018-10-23 23:42:53 +0200
committerRickard Green <rickard@erlang.org>2018-10-23 23:42:53 +0200
commit0dc6118fcc1dbb08a35f0064534be98f796f9c8f (patch)
treeb29719cf2f2c2695d16e3cc9fc4100078eafba6d /Makefile.in
parent6ee89323550defedc56cdbf5e0dbcd1e88762b0d (diff)
parent01afc36575fcfd25235245475bc44e9c242127bd (diff)
downloaderlang-0dc6118fcc1dbb08a35f0064534be98f796f9c8f.tar.gz
Merge branch 'maint'
* maint: Fixup development runtime dependencies
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in13
1 files changed, 9 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index cc9a9375c9..a07a779f10 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -161,6 +161,8 @@ ERLANG_LIBDIR = $(DESTDIR)$(ERLANG_INST_LIBDIR)
# Must be GNU make!
MAKE = @MAKE_PROG@
+PERL = @PERL@
+
NATIVE_LIBS_ENABLED = @NATIVE_LIBS_ENABLED@
ifeq ($(NATIVE_LIBS_ENABLED),yes)
@@ -327,16 +329,16 @@ ifneq ($(CROSS_COMPILING),yes)
# Not cross compiling
ifeq ($(BOOTSTRAP_ONLY),yes)
-all: bootstrap
+all: bootstrap check_dev_rt_dep
else
# The normal case; not cross compiling, and not bootstrap only build.
-all: bootstrap libs local_setup
+all: bootstrap libs local_setup check_dev_rt_dep
endif
else
# Cross compiling
-all: cross_check_erl depend emulator libs start_scripts
+all: cross_check_erl depend emulator libs start_scripts check_dev_rt_dep
endif
@@ -356,7 +358,10 @@ erlang_inst_libdir_configured:
bootstrap: depend all_bootstraps
-
+check_dev_rt_dep:
+ @if `grep DEVELOPMENT "$(ERL_TOP)/make/otp_version_tickets" 1>/dev/null 2>&1`; then \
+ LANG=C "$(PERL)" "$(ERL_TOP)/make/fixup_development_runtime_dependencies" "$(ERL_TOP)"; \
+ fi
ifeq ($(OTP_STRICT_INSTALL),yes)