diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | Makefile.objs | 2 | ||||
| -rw-r--r-- | Makefile.target | 2 | ||||
| -rw-r--r-- | rules.mak | 2 |
4 files changed, 6 insertions, 3 deletions
@@ -144,7 +144,8 @@ trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events config-host.mak @cmp -s $@ trace-dtrace.dtrace || cp $@ trace-dtrace.dtrace trace-dtrace.o: trace-dtrace.dtrace $(GENERATED_HEADERS) - $(call quiet-command,dtrace $(CONFIG_DTRACE_FLAGS) -o $@ -G -s $<, " GEN trace-dtrace.o") + /bin/true +# $(call quiet-command,dtrace $(CONFIG_DTRACE_FLAGS) -o $@ -G -s $<, " GEN trace-dtrace.o") simpletrace.o: simpletrace.c $(GENERATED_HEADERS) diff --git a/Makefile.objs b/Makefile.objs index bf5b103..554e7f0 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -311,7 +311,9 @@ libdis-$(CONFIG_SPARC_DIS) += sparc-dis.o # trace ifeq ($(TRACE_BACKEND),dtrace) +ifeq ($(strip $(CONFIG_SOLARIS)),) trace-obj-y = trace-dtrace.o +endif else trace-obj-y = trace.o ifeq ($(TRACE_BACKEND),simple) diff --git a/Makefile.target b/Makefile.target index fa8b1f0..86ec693 100644 --- a/Makefile.target +++ b/Makefile.target @@ -387,7 +387,7 @@ ifneq ($(strip $(CONFIG_SOLARIS)),) $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(call quiet-command, dtrace $(CONFIG_DTRACE_FLAGS) -o ../trace-dtrace.o -s ../trace-dtrace.dtrace -G $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)," LINK $(TARGET_DIR)$@.dtrace") $(call quiet-command, find ../ -type f -name '*.o' -exec ../ctf.sh '{}' \;) - $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)) + $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) ../trace-dtrace.o) $(call CTFMERGE, $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)) else $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) @@ -31,7 +31,7 @@ ifeq ($(TRACE_BACKEND),dtrace) ifneq ($(strip $(CONFIG_SOLARIS)),) %$(EXESUF): %.o $(call quiet-command, dtrace $(CONFIG_DTRACE_FLAGS) -o trace-dtrace.o -s trace-dtrace.dtrace -G $^," LINK $(TARGET_DIR)$@.dtrace") - $(call LINK,$^) + $(call LINK,$^ trace-dtrace.o) else %$(EXESUF): %.o $(call LINK,$^) |