Mercurial > hg > graal-compiler
comparison make/solaris/makefiles/dtrace.make @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | 9024b6b53ec2 |
children | 892acf0431ef |
comparison
equal
deleted
inserted
replaced
6711:ae13cc658b80 | 6948:e522a00b91aa |
---|---|
204 *) rm -f $@ && mv $@.tmp $@ && echo Updated $@;; \ | 204 *) rm -f $@ && mv $@.tmp $@ && echo Updated $@;; \ |
205 esac | 205 esac |
206 | 206 |
207 # $@.tmp is created first to avoid an empty $(JVMOFFS).h if an error occurs. | 207 # $@.tmp is created first to avoid an empty $(JVMOFFS).h if an error occurs. |
208 $(JVMOFFS).h: $(GENOFFS) | 208 $(JVMOFFS).h: $(GENOFFS) |
209 $(QUIETLY) LD_LIBRARY_PATH=. ./$(GENOFFS) -header > $@.tmp | 209 $(QUIETLY) LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ./$(GENOFFS) -header > $@.tmp |
210 $(QUIETLY) $(CONDITIONALLY_UPDATE_JVMOFFS_TARGET) | 210 $(QUIETLY) $(CONDITIONALLY_UPDATE_JVMOFFS_TARGET) |
211 | 211 |
212 $(JVMOFFS)Index.h: $(GENOFFS) | 212 $(JVMOFFS)Index.h: $(GENOFFS) |
213 $(QUIETLY) LD_LIBRARY_PATH=. ./$(GENOFFS) -index > $@.tmp | 213 $(QUIETLY) LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ./$(GENOFFS) -index > $@.tmp |
214 $(QUIETLY) $(CONDITIONALLY_UPDATE_JVMOFFS_TARGET) | 214 $(QUIETLY) $(CONDITIONALLY_UPDATE_JVMOFFS_TARGET) |
215 | 215 |
216 $(JVMOFFS).cpp: $(GENOFFS) $(JVMOFFS).h $(JVMOFFS)Index.h | 216 $(JVMOFFS).cpp: $(GENOFFS) $(JVMOFFS).h $(JVMOFFS)Index.h |
217 $(QUIETLY) LD_LIBRARY_PATH=. ./$(GENOFFS) -table > $@.tmp | 217 $(QUIETLY) LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ./$(GENOFFS) -table > $@.tmp |
218 $(QUIETLY) $(CONDITIONALLY_UPDATE_JVMOFFS_TARGET) | 218 $(QUIETLY) $(CONDITIONALLY_UPDATE_JVMOFFS_TARGET) |
219 | 219 |
220 $(JVMOFFS.o): $(JVMOFFS).h $(JVMOFFS).cpp | 220 $(JVMOFFS.o): $(JVMOFFS).h $(JVMOFFS).cpp |
221 $(QUIETLY) $(CXX) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp | 221 $(QUIETLY) $(CXX) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp |
222 | 222 |