comparison make/bsd/makefiles/dtrace.make @ 6845:9024b6b53ec2

8000485: Hotspot build fails in Solaris Studio IDE when building dtrace Summary: Prepend '.' to the existing native library path Reviewed-by: kvn, sspitsyn
author vlivanov
date Fri, 05 Oct 2012 19:44:49 -0700
parents 719f7007c8e8
children d804e148cff8
comparison
equal deleted inserted replaced
6844:9a9b6e05ffb4 6845:9024b6b53ec2
1 # 1 #
2 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
112 $(QUIETLY) $(LINK.CXX) -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \ 112 $(QUIETLY) $(LINK.CXX) -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \
113 ./lib$(GENOFFS).dylib 113 ./lib$(GENOFFS).dylib
114 114
115 # $@.tmp is created first to avoid an empty $(JVMOFFS).h if an error occurs. 115 # $@.tmp is created first to avoid an empty $(JVMOFFS).h if an error occurs.
116 $(JVMOFFS).h: $(GENOFFS) 116 $(JVMOFFS).h: $(GENOFFS)
117 $(QUIETLY) DYLD_LIBRARY_PATH=. ./$(GENOFFS) -header > $@.tmp; touch $@; \ 117 $(QUIETLY) DYLD_LIBRARY_PATH=.:$(DYLD_LIBRARY_PATH) ./$(GENOFFS) -header > $@.tmp; touch $@; \
118 if [ `diff $@.tmp $@ > /dev/null 2>&1; echo $$?` -ne 0 ] ; \ 118 if [ `diff $@.tmp $@ > /dev/null 2>&1; echo $$?` -ne 0 ] ; \
119 then rm -f $@; mv $@.tmp $@; \ 119 then rm -f $@; mv $@.tmp $@; \
120 else rm -f $@.tmp; \ 120 else rm -f $@.tmp; \
121 fi 121 fi
122 122
123 $(JVMOFFS)Index.h: $(GENOFFS) 123 $(JVMOFFS)Index.h: $(GENOFFS)
124 $(QUIETLY) DYLD_LIBRARY_PATH=. ./$(GENOFFS) -index > $@.tmp; touch $@; \ 124 $(QUIETLY) DYLD_LIBRARY_PATH=.:$(DYLD_LIBRARY_PATH) ./$(GENOFFS) -index > $@.tmp; touch $@; \
125 if [ `diff $@.tmp $@ > /dev/null 2>&1; echo $$?` -ne 0 ] ; \ 125 if [ `diff $@.tmp $@ > /dev/null 2>&1; echo $$?` -ne 0 ] ; \
126 then rm -f $@; mv $@.tmp $@; \ 126 then rm -f $@; mv $@.tmp $@; \
127 else rm -f $@.tmp; \ 127 else rm -f $@.tmp; \
128 fi 128 fi
129 129
130 $(JVMOFFS).cpp: $(GENOFFS) $(JVMOFFS).h $(JVMOFFS)Index.h 130 $(JVMOFFS).cpp: $(GENOFFS) $(JVMOFFS).h $(JVMOFFS)Index.h
131 $(QUIETLY) DYLD_LIBRARY_PATH=. ./$(GENOFFS) -table > $@.tmp; touch $@; \ 131 $(QUIETLY) DYLD_LIBRARY_PATH=.:$(DYLD_LIBRARY_PATH) ./$(GENOFFS) -table > $@.tmp; touch $@; \
132 if [ `diff $@.tmp $@ > /dev/null 2>&1; echo $$?` -ne 0 ] ; \ 132 if [ `diff $@.tmp $@ > /dev/null 2>&1; echo $$?` -ne 0 ] ; \
133 then rm -f $@; mv $@.tmp $@; \ 133 then rm -f $@; mv $@.tmp $@; \
134 else rm -f $@.tmp; \ 134 else rm -f $@.tmp; \
135 fi 135 fi
136 136