diff options
| author | Lukas Larsson <[email protected]> | 2014-01-28 11:58:37 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-01-28 11:58:37 +0100 |
| commit | bb1d3d51651b5f2cd9d8c8b1e541c7e841aaab18 (patch) | |
| tree | 8a50a59bb8dab3485bcd2aa1d6f3086d4f51332c /lib/runtime_tools/c_src/Makefile.in | |
| parent | 1bf94703047ae527004dcda59a443d4cd192704a (diff) | |
| parent | 635553bfcfdb33c337ece558240de3692920ca95 (diff) | |
| download | otp-bb1d3d51651b5f2cd9d8c8b1e541c7e841aaab18.tar.gz otp-bb1d3d51651b5f2cd9d8c8b1e541c7e841aaab18.tar.bz2 otp-bb1d3d51651b5f2cd9d8c8b1e541c7e841aaab18.zip | |
Merge branch 'rzezeski/rz_fix_dtrace_illumos/OTP-11622'
* rzezeski/rz_fix_dtrace_illumos/OTP-11622:
Fix DTrace build on Illumos
Diffstat (limited to 'lib/runtime_tools/c_src/Makefile.in')
| -rw-r--r-- | lib/runtime_tools/c_src/Makefile.in | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in index d315a90e18..2bcb93b4dd 100644 --- a/lib/runtime_tools/c_src/Makefile.in +++ b/lib/runtime_tools/c_src/Makefile.in @@ -21,11 +21,6 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk include $(ERL_TOP)/make/$(TARGET)/otp_ded.mk # ---------------------------------------------------- -# Items from top-level configure -# ---------------------------------------------------- -DTRACE_ENABLED=@DTRACE_ENABLED@ -DTRACE_ENABLED_2STEP=@DTRACE_ENABLED_2STEP@ -# ---------------------------------------------------- # Application version # ---------------------------------------------------- include ../vsn.mk @@ -108,28 +103,7 @@ _create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR)) debug opt valgrind: $(SOLIBS) $(OBJDIR) $(LIBDIR) $(NIF_LIB) -ifdef DTRACE_ENABLED -DTRACE_USER_HEADER=$(OBJDIR)/dtrace_user.h -$(OBJDIR)/dtrace_user.h: ./dtrace_user.d - $(dtrace_verbose)dtrace -h -C $(INCLUDES) \ - -s ./dtrace_user.d \ - -o ./dtrace_user.tmp - $(V_at)sed -e '/^#define[ ]*ERLANG_[A-Z0-9_]*(.*)/y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/' ./dtrace_user.tmp > $@ - $(V_at)rm ./dtrace_user.tmp -else -DTRACE_USER_HEADER= -endif - -DTRACE_OBJS = -ifdef DTRACE_ENABLED_2STEP -DTRACE_OBJS += $(OBJDIR)/dtrace_user.o -$(OBJDIR)/dtrace_user.o: $(before_DTrace_OBJS) $(OBJDIR)/dtrace_user.h - $(dtrace_verbose)dtrace -G -C \ - -s ./dtrace_user.d \ - -o $@ $(before_DTrace_OBJS) -endif - -DYNTRACE_OBJS = $(before_DTrace_OBJS) $(DTRACE_OBJS) +DYNTRACE_OBJS = $(before_DTrace_OBJS) $(OBJDIR): -@mkdir -p $(OBJDIR) @@ -137,7 +111,7 @@ $(OBJDIR): $(LIBDIR): -@mkdir -p $(LIBDIR) -$(OBJDIR)/dyntrace$(TYPEMARKER).o: dyntrace.c $(DTRACE_USER_HEADER) +$(OBJDIR)/dyntrace$(TYPEMARKER).o: dyntrace.c $(V_at)$(INSTALL_DIR) $(OBJDIR) $(V_CC) -c -o $@ $(ALL_CFLAGS) $< |