From d395b625fab5a5b0119123e4c956c7efecf50662 Mon Sep 17 00:00:00 2001 From: Rickard Green Date: Tue, 5 Mar 2019 16:23:33 +0100 Subject: Fix build of bootstrap --- lib/Makefile | 4 ++-- lib/erl_interface/Makefile | 4 ++++ lib/erl_interface/configure.in | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/Makefile b/lib/Makefile index 6605c6145c..ea2827bef0 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -58,10 +58,10 @@ else SUB_DIRECTORIES = hipe parsetools asn1/src else ifdef TERTIARY_BOOTSTRAP - SUB_DIRECTORIES = snmp sasl jinterface syntax_tools wx + SUB_DIRECTORIES = snmp sasl erl_interface jinterface syntax_tools wx else ifdef DOC_BOOTSTRAP - SUB_DIRECTORIES = xmerl edoc erl_docgen + SUB_DIRECTORIES = xmerl edoc erl_docgen public_key else # Not bootstrap build SUB_DIRECTORIES = $(ERTS_APPLICATIONS) \ $(ERLANG_APPLICATIONS) \ diff --git a/lib/erl_interface/Makefile b/lib/erl_interface/Makefile index 9471b0df18..5fff2cabdd 100644 --- a/lib/erl_interface/Makefile +++ b/lib/erl_interface/Makefile @@ -23,7 +23,11 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk # ---------------------------------------------------- # Common Macros # ---------------------------------------------------- +ifdef TERTIARY_BOOTSTRAP +SUB_DIRECTORIES = +else SUB_DIRECTORIES = src doc/src +endif SPECIAL_TARGETS = diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in index 53c2f7069c..67acb7c180 100644 --- a/lib/erl_interface/configure.in +++ b/lib/erl_interface/configure.in @@ -188,7 +188,7 @@ AC_MSG_CHECKING([for deprecated attribute]) AC_TRY_COMPILE([], [void my_function(void) __attribute__((deprecated));], [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_DEPRECATED_ATTRIBUTE, [], [Define to 1 if you have the `deprecated' attribute])], + AC_DEFINE(HAVE_DEPRECATED_ATTRIBUTE, [1], [Define to 1 if you have the `deprecated' attribute])], [AC_MSG_RESULT(no)]) -- cgit v1.2.3