aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2012-01-11 10:15:59 +0100
committerRaimo Niskanen <[email protected]>2012-01-13 14:37:05 +0100
commite601d283b9edafc6ded6589947f1f2de9ede0248 (patch)
treeb60b0b0afbb9539596c450aa984d14db97b1959d /erts/emulator
parent5bdfce65ad97251e25b09d94231f5a7386a3c4e3 (diff)
downloadotp-e601d283b9edafc6ded6589947f1f2de9ede0248.tar.gz
otp-e601d283b9edafc6ded6589947f1f2de9ede0248.tar.bz2
otp-e601d283b9edafc6ded6589947f1f2de9ede0248.zip
erts,tools: Fix parallel make for erts/lib_src
Use a make timestamp file to condense dependencies to some part(s) of erts/lib_src build results.
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/Makefile.in15
1 files changed, 6 insertions, 9 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index f58b5ba31e..b579ffe7e8 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -317,12 +317,8 @@ LIBSCTP = @LIBSCTP@
ORG_THR_LIBS=@EMU_THR_LIBS@
THR_LIB_NAME=@EMU_THR_LIB_NAME@
-ifneq ($(strip $(THR_LIB_NAME)),)
-DEPLIBS += $(ERL_TOP)/erts/lib/internal/$(TARGET)/$(LIB_PREFIX)erts_internal_r$(TYPEMARKER)$(LIB_SUFFIX) \
- $(ERL_TOP)/erts/lib/internal/$(TARGET)/$(LIB_PREFIX)ethread$(TYPEMARKER)$(LIB_SUFFIX)
-else
-DEPLIBS += $(ERL_TOP)/erts/lib/internal/$(TARGET)/$(LIB_PREFIX)erts_internal$(TYPEMARKER)$(LIB_SUFFIX)
-endif
+ERTS_LIB = $(ERL_TOP)/erts/lib_src/obj/$(TARGET)/$(TYPE)/MADE
+DEPLIBS += $(ERTS_LIB)
THR_LIBS=$(subst -l$(THR_LIB_NAME),-l$(THR_LIB_NAME)$(TYPEMARKER), \
$(subst -lerts_internal_r,-lerts_internal_r$(TYPEMARKER),$(ORG_THR_LIBS)))
@@ -389,7 +385,7 @@ ifeq ($(FLAVOR)-@ERTS_BUILD_SMP_EMU@,smp-no)
all:
@echo '*** Omitted build of emulator with smp support'
else
-all: generate erts_lib $(BINDIR)/$(EMULATOR_EXECUTABLE) $(UNIX_ONLY_BUILDS)
+all: generate $(BINDIR)/$(EMULATOR_EXECUTABLE) $(UNIX_ONLY_BUILDS)
ifeq ($(OMIT_OMIT_FP),yes)
@echo '* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *'
@echo '* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *'
@@ -405,7 +401,7 @@ endif
include zlib/zlib.mk
include pcre/pcre.mk
-erts_lib:
+$(ERTS_LIB):
cd $(ERL_TOP)/erts/lib_src && $(MAKE) $(TYPE)
clean:
@@ -422,6 +418,7 @@ ifndef Z_LIB
$(RM) -rf $(ZLIB_OBJDIR)
endif
rm -f $(OBJS) $(OBJDIR)/libepcre.a
+ cd $(ERL_TOP)/erts/lib_src && $(MAKE) clean
.PHONY: all clean
@@ -653,7 +650,7 @@ endif
#
CS_SRC = sys/$(ERLANG_OSTYPE)/erl_child_setup.c
-$(BINDIR)/$(CS_EXECUTABLE): $(CS_SRC)
+$(BINDIR)/$(CS_EXECUTABLE): $(CS_SRC) $(ERTS_LIB)
$(CS_PURIFY) $(CC) $(CS_LDFLAGS) -o $(BINDIR)/$(CS_EXECUTABLE) \
$(CS_CFLAGS) $(COMMON_INCLUDES) $(CS_SRC) $(CS_LIBS)