aboutsummaryrefslogtreecommitdiffstats
path: root/erts/Makefile.in
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2012-06-04 11:34:42 +0200
committerLukas Larsson <[email protected]>2012-06-04 11:34:42 +0200
commit9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc (patch)
tree94058c8df73356197dca04da701d5b0402d12b59 /erts/Makefile.in
parent9d590cf3db1210882c82a82381a07ae8f9535f79 (diff)
parent5c2dad487e6af1a48fa3a1f3d985b6b891788bde (diff)
downloadotp-9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc.tar.gz
otp-9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc.tar.bz2
otp-9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc.zip
Merge branch 'bjorn/remove-hybrid-heap/OTP-10105' into maint
* bjorn/remove-hybrid-heap/OTP-10105: Remove stale code for hybrid heap and incremental GC Remove the hipe_bifs:show_message_area/0 BIF Remove support for erlang:system_info(global_heaps_size) Remove the erlang:garbage_collect_message_area/0 BIF Remove workarounds for hybrid and shared heaps in test suites
Diffstat (limited to 'erts/Makefile.in')
-rw-r--r--erts/Makefile.in18
1 files changed, 0 insertions, 18 deletions
diff --git a/erts/Makefile.in b/erts/Makefile.in
index 79a66a3ba2..5df6d71ef3 100644
--- a/erts/Makefile.in
+++ b/erts/Makefile.in
@@ -31,21 +31,10 @@ ifeq ($(NO_START_SCRIPTS),)
ERTSDIRS += start_scripts
endif
-# Until hybrid is nofrag, don't build it.
-#BUILD_HYBRID_EMU=@ERTS_BUILD_HYBRID_EMU@
-BUILD_HYBRID_EMU=no
-
EXTRA_FLAVORS=smp
-ifeq ($(BUILD_HYBRID_EMU),yes)
-EXTRA_FLAVORS += hybrid
-endif
.PHONY: all
-ifneq ($(BUILD_HYBRID_EMU),yes)
all: smp opt
-else
-all: hybrid smp opt
-endif
.PHONY: docs
docs:
@@ -68,13 +57,6 @@ debug opt clean:
$(EXTRA_FLAVORS):
( cd emulator && $(MAKE) opt FLAVOR=$@ )
-ifneq ($(BUILD_HYBRID_EMU),yes)
-.PHONY: hybrid
-hybrid:
- @echo '*** Omitted build of hybrid heap emulator'
- @echo '*** since target is $(TARGET)'
-endif
-
# Make erl script and erlc in $(ERL_TOP)/bin which runs the compiled version
# Note that erlc is not a script and requires extra handling on cygwin.
# also note that this file is not created by autoconf, that's why @EXEEXT@