diff options
| author | Patrik Nyblom <[email protected]> | 2013-03-18 10:46:06 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2013-03-18 10:46:06 +0100 |
| commit | 887577cfaeee55461f1e8f7b4f9472cbca1d2a2e (patch) | |
| tree | a9332e7f1fb367828d852ca165fefc7e403efb21 | |
| parent | ab7af05626c702aae342c708028761cea220a3f3 (diff) | |
| parent | c096b4def1f37ad575e020232993d7bc0a763338 (diff) | |
| download | otp-887577cfaeee55461f1e8f7b4f9472cbca1d2a2e.tar.gz otp-887577cfaeee55461f1e8f7b4f9472cbca1d2a2e.tar.bz2 otp-887577cfaeee55461f1e8f7b4f9472cbca1d2a2e.zip | |
Merge branch 'pan/dtrace_header_dependency' into maint
* pan/dtrace_header_dependency:
Add dependency to dtrace header for parallell make
OTP-10949
| -rw-r--r-- | erts/emulator/Makefile.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 133ecd69e4..4f2f647742 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -476,8 +476,10 @@ endif ifdef DTRACE_ENABLED # global.h causes problems by including dtrace-wrapper.h which includes # the autogenerated erlang_dtrace.h ... so make erlang_dtrace.h very early. -generate: $(TARGET)/erlang_dtrace.h $(GENERATE) +DTRACE_HEADERS = $(TARGET)/erlang_dtrace.h +generate: $(DTRACE_HEADERS) $(GENERATE) else +DTRACE_HEADERS = generate: $(GENERATE) endif @@ -863,7 +865,7 @@ $(OBJDIR)/%.o: hipe/%.c $(BINDIR)/hipe_mkliterals$(TF_MARKER): $(OBJDIR)/hipe_mkliterals.o $(ld_verbose)$(CC) $(CFLAGS) $(INCLUDES) -o $@ $< -$(OBJDIR)/hipe_mkliterals.o: $(HIPE_ASM) $(TTF_DIR)/erl_alloc_types.h \ +$(OBJDIR)/hipe_mkliterals.o: $(HIPE_ASM) $(TTF_DIR)/erl_alloc_types.h $(DTRACE_HEADERS) \ $(TTF_DIR)/OPCODES-GENERATED $(TARGET)/TABLES-GENERATED $(TTF_DIR)/hipe_literals.h: $(BINDIR)/hipe_mkliterals$(TF_MARKER) |