aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2015-07-14 16:37:41 +0200
committerLukas Larsson <[email protected]>2015-07-14 16:37:41 +0200
commit6cf4260ae1604cdb20ad7782d8a491edcc3310e7 (patch)
tree226ccae99a48f4dd4d27a014b62798cefe501947 /lib/tools
parent31623a16629dee45e3d3e6f33ffb0865b157301a (diff)
parentd2a0690865339a2d37badc4b79025f97b34e3d46 (diff)
downloadotp-6cf4260ae1604cdb20ad7782d8a491edcc3310e7.tar.gz
otp-6cf4260ae1604cdb20ad7782d8a491edcc3310e7.tar.bz2
otp-6cf4260ae1604cdb20ad7782d8a491edcc3310e7.zip
Merge branch 'lukas/ose/remove/OTP-12573'
* lukas/ose/remove/OTP-12573: Remove OSE from erl_interface ose: Remove all code related to the OSE port
Diffstat (limited to 'lib/tools')
-rw-r--r--lib/tools/c_src/Makefile.in8
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
index 66bba229f6..e8bce149b1 100644
--- a/lib/tools/c_src/Makefile.in
+++ b/lib/tools/c_src/Makefile.in
@@ -97,11 +97,8 @@ DRIVERS=
ifneq ($(strip $(ETHR_LIB_NAME)),)
# Need ethread package for emem
-ifneq ($(findstring ose,$(TARGET)),ose)
-# Do not build on OSE
PROGS += $(BIN_DIR)/emem$(TYPEMARKER)@EXEEXT@
endif
-endif
EMEM_OBJ_DIR=$(OBJ_DIR)/emem
CREATE_DIRS += $(EMEM_OBJ_DIR)
@@ -152,12 +149,7 @@ ERTS_LIB = $(ERL_TOP/erts/lib_src/obj/$(TARGET)/$(TYPE)/MADE
_create_dirs := $(shell mkdir -p $(CREATE_DIRS))
-ifneq ($(findstring ose,$(TARGET)),ose)
all: $(PROGS) $(DRIVERS)
-else
-# Do not build dynamic files on OSE
-all:
-endif
$(ERTS_LIB):
$(make_verbose)cd $(ERL_TOP)/erts/lib_src && $(MAKE) $(TYPE)