aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/Makefile.in
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-10-30 17:56:37 +0100
committerLukas Larsson <[email protected]>2014-02-24 15:16:00 +0100
commita6788ea337a2319a2d1a42ee4618553a1c7765bf (patch)
tree76bd19e2bf8076a1b19c2e7e0d4215b9469e747e /erts/emulator/Makefile.in
parentd932131754c2bfb2e0539b6419e3d09533fe84e8 (diff)
downloadotp-a6788ea337a2319a2d1a42ee4618553a1c7765bf.tar.gz
otp-a6788ea337a2319a2d1a42ee4618553a1c7765bf.tar.bz2
otp-a6788ea337a2319a2d1a42ee4618553a1c7765bf.zip
ose: Fix various build environment issues
Diffstat (limited to 'erts/emulator/Makefile.in')
-rw-r--r--erts/emulator/Makefile.in12
1 files changed, 10 insertions, 2 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 9935b911f6..63deae76d5 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -690,6 +690,14 @@ $(OBJDIR)/%.o: $(TTF_DIR)/%.c
$(OBJDIR)/%.o: sys/$(ERLANG_OSTYPE)/%.c
$(V_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+ifeq ($(findstring ose,$(TARGET)),ose)
+$(OBJDIR)/ose_confd.o: $(OSE_CONFD)
+ $(V_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+
+$(OBJDIR)/crt0_lm.o: $(CRT0_LM)
+ $(V_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+endif
+
$(OBJDIR)/%.o: sys/common/%.c
$(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
@@ -815,8 +823,8 @@ OS_OBJS = \
$(OBJDIR)/gzio.o \
$(OBJDIR)/elib_memmove.o
-OS_OBJS += $(OSEROOT)/src/ose_confd.o \
- $(OSEROOT)/src/crt0_lm.o
+OS_OBJS += $(OBJDIR)/ose_confd.o \
+ $(OBJDIR)/crt0_lm.o
OS_OBJS += $(OBJDIR)/sys_float.o \
$(OBJDIR)/sys_time.o