make/solaris/makefiles/dtrace.make

rev 416 : 6769128: failure to run generateJvmOffsets is ignored
Reviewed-by:

*** 114,144 ****
  
  $(GENOFFS): $(DTRACE_SRCDIR)/$(GENOFFS)Main.c lib$(GENOFFS).so
          $(QUIETLY) $(LINK.CC) -z nodefs -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \
                  ./lib$(GENOFFS).so
  
! # $@.tmp is created first. It's to avoid empty $(JVMOFFS).h produced in error case.
  $(JVMOFFS).h: $(GENOFFS)
!         $(QUIETLY) LD_LIBRARY_PATH=. ./$(GENOFFS) -header > $@.tmp ; \
!         if [ `diff $@.tmp $@ > /dev/null 2>&1; echo $$?` -ne 0 ] ; \
!         then rm -f $@; mv $@.tmp $@; echo Updated $@ ; \
!         else rm -f $@.tmp; \
!         fi
  
  $(JVMOFFS)Index.h: $(GENOFFS)
!         $(QUIETLY) LD_LIBRARY_PATH=. ./$(GENOFFS) -index > $@.tmp ; \
!         if [ `diff $@.tmp $@ > /dev/null 2>&1; echo $$?` -ne 0 ] ; \
!         then rm -f $@; mv $@.tmp $@; echo Updated $@ ; \
!         else rm -f $@.tmp; \
!         fi
  
  $(JVMOFFS).cpp: $(GENOFFS) $(JVMOFFS).h $(JVMOFFS)Index.h
!         $(QUIETLY) LD_LIBRARY_PATH=. ./$(GENOFFS) -table > $@.tmp ; \
!         if [ `diff $@.tmp $@ > /dev/null 2>&1; echo $$?` -ne 0 ] ; \
!         then rm -f $@; mv $@.tmp $@; echo Updated $@ ; \
!         else rm -f $@.tmp; \
!         fi
  
  $(JVMOFFS.o): $(JVMOFFS).h $(JVMOFFS).cpp 
          $(QUIETLY) $(CCC) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp
  
  $(LIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE)
--- 114,142 ----
  
  $(GENOFFS): $(DTRACE_SRCDIR)/$(GENOFFS)Main.c lib$(GENOFFS).so
          $(QUIETLY) $(LINK.CC) -z nodefs -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \
                  ./lib$(GENOFFS).so
  
! CONDITIONALLY_UPDATE_JVMOFFS_TARGET = \
!         cmp -s $@ $@.tmp; \
!         case $$? in \
!         0) rm -f $@.tmp;; \
!         *) rm -f $@ && mv $@.tmp $@ && echo Updated $@;; \
!         esac
! 
! # $@.tmp is created first to avoid an empty $(JVMOFFS).h if an error occurs.
  $(JVMOFFS).h: $(GENOFFS)
!         $(QUIETLY) LD_LIBRARY_PATH=. ./$(GENOFFS) -header > $@.tmp
!         $(QUIETLY) $(CONDITIONALLY_UPDATE_JVMOFFS_TARGET)
  
  $(JVMOFFS)Index.h: $(GENOFFS)
!         $(QUIETLY) LD_LIBRARY_PATH=. ./$(GENOFFS) -index > $@.tmp
!         $(QUIETLY)  $(CONDITIONALLY_UPDATE_JVMOFFS_TARGET)
  
  $(JVMOFFS).cpp: $(GENOFFS) $(JVMOFFS).h $(JVMOFFS)Index.h
!         $(QUIETLY) LD_LIBRARY_PATH=. ./$(GENOFFS) -table > $@.tmp
!         $(QUIETLY) $(CONDITIONALLY_UPDATE_JVMOFFS_TARGET)
  
  $(JVMOFFS.o): $(JVMOFFS).h $(JVMOFFS).cpp 
          $(QUIETLY) $(CCC) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp
  
  $(LIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE)