aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.in2
-rw-r--r--configure.src2
-rw-r--r--lib/Makefile4
-rw-r--r--lib/erl_interface/Makefile4
-rw-r--r--lib/erl_interface/configure.in2
-rwxr-xr-xotp_build2
6 files changed, 11 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index 30755c2e4c..494ab52b3a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -769,7 +769,7 @@ tertiary_bootstrap_copy:
true; \
done
# copy erl_interface includes
- $(V_at)for x in lib/erl_interface/include/* lib/erl_interface/include/$(TARGET)/*; do \
+ $(V_at)for x in lib/erl_interface/include/*.h lib/erl_interface/include/$(TARGET)/*.h; do \
BN=`basename $$x`; \
TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/erl_interface/include/$$BN; \
test -f $$TF && \
diff --git a/configure.src b/configure.src
index 889902eb96..4b748f2545 100644
--- a/configure.src
+++ b/configure.src
@@ -70,8 +70,10 @@ while test $# != 0; do
ERL_TOP="$user_srcdir"
;;
--enable-bootstrap-only)
+ config_arguments="$config_arguments --enable-bootstrap-only"
bootstrap_only=yes;;
--disable-bootstrap-only)
+ config_arguments="$config_arguments --disable-bootstrap-only"
bootstrap_only=no;;
--enable-option-checking)
echo "ERROR: Cannot enable option checking" 1>&2
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)])
diff --git a/otp_build b/otp_build
index b1c5bcc939..3dfe24a299 100755
--- a/otp_build
+++ b/otp_build
@@ -30,7 +30,7 @@ AUTOCONF_SUBDIRS="$AUTOCONF_SUBDIRS make erts"
# partly built in one of the bootstrap phases. Applications that
# only get some static includes copied into the bootstrap directory
# should not be included.
-bootstrap_apps="erts lib/asn1 lib/compiler lib/hipe lib/ic lib/kernel lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools"
+bootstrap_apps="erts lib/asn1 lib/compiler lib/erl_interface lib/hipe lib/kernel lib/jinterface lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools lib/wx"
# We will quote a bit more than needed, but the important thing is that
# all that needs quoting will be quoted...