1.1 --- a/make/solaris/makefiles/dtrace.make Tue Jan 31 13:12:39 2012 +0100
1.2 +++ b/make/solaris/makefiles/dtrace.make Mon Feb 06 09:14:22 2012 +0100
1.3 @@ -150,11 +150,11 @@
1.4
1.5 lib$(GENOFFS).so: $(DTRACE_SRCDIR)/$(GENOFFS).cpp $(DTRACE_SRCDIR)/$(GENOFFS).h \
1.6 $(LIBJVM.o)
1.7 - $(QUIETLY) $(CCC) $(CPPFLAGS) $(GENOFFS_CFLAGS) $(SHARED_FLAG) $(PICFLAG) \
1.8 + $(QUIETLY) $(CXX) $(CXXFLAGS) $(GENOFFS_CFLAGS) $(SHARED_FLAG) $(PICFLAG) \
1.9 $(LFLAGS_GENOFFS) -o $@ $(DTRACE_SRCDIR)/$(GENOFFS).cpp -lc
1.10
1.11 $(GENOFFS): $(DTRACE_SRCDIR)/$(GENOFFS)Main.c lib$(GENOFFS).so
1.12 - $(QUIETLY) $(LINK.CC) -z nodefs -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \
1.13 + $(QUIETLY) $(LINK.CXX) -z nodefs -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \
1.14 ./lib$(GENOFFS).so
1.15
1.16 CONDITIONALLY_UPDATE_JVMOFFS_TARGET = \
1.17 @@ -178,7 +178,7 @@
1.18 $(QUIETLY) $(CONDITIONALLY_UPDATE_JVMOFFS_TARGET)
1.19
1.20 $(JVMOFFS.o): $(JVMOFFS).h $(JVMOFFS).cpp
1.21 - $(QUIETLY) $(CCC) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp
1.22 + $(QUIETLY) $(CXX) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp
1.23
1.24 $(LIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE)
1.25 @echo Making $@
