aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-03-06 16:09:20 +0100
committerRickard Green <[email protected]>2019-03-06 16:09:20 +0100
commitdd606f4c814c43e0a4f0a109b6c5220e4f99775c (patch)
treee96bd6afc7df4ea2cc47fe30d4341ad18a9cf2c7
parent2169b5ba0a182d6fc9712365cb696bc7bee605c7 (diff)
parent95fb09ddbd7cb9cc92b06e424dcb33c7f140799d (diff)
downloadotp-dd606f4c814c43e0a4f0a109b6c5220e4f99775c.tar.gz
otp-dd606f4c814c43e0a4f0a109b6c5220e4f99775c.tar.bz2
otp-dd606f4c814c43e0a4f0a109b6c5220e4f99775c.zip
Merge branch 'rickard/bootstrap-build-fix'
* rickard/bootstrap-build-fix: Fix bootstrap build of erl_interface
-rw-r--r--lib/erl_interface/Makefile4
-rw-r--r--lib/erl_interface/src/Makefile2
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/erl_interface/Makefile b/lib/erl_interface/Makefile
index 5fff2cabdd..9471b0df18 100644
--- a/lib/erl_interface/Makefile
+++ b/lib/erl_interface/Makefile
@@ -23,11 +23,7 @@ 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/src/Makefile b/lib/erl_interface/src/Makefile
index 800557fbfe..00c49f1622 100644
--- a/lib/erl_interface/src/Makefile
+++ b/lib/erl_interface/src/Makefile
@@ -27,7 +27,9 @@ include $(ERL_TOP)/make/output.mk
include $(ERL_TOP)/make/target.mk
debug opt shared purify quantify purecov gcov:
+ifndef TERTIARY_BOOTSTRAP
$(make_verbose)$(MAKE) -f $(TARGET)/Makefile TYPE=$@
+endif
clean depend docs release release_docs tests release_tests check xmllint:
$(make_verbose)$(MAKE) -f $(TARGET)/Makefile $@