Mercurial > hg > truffle
comparison make/solaris/makefiles/dtrace.make @ 6190:61a94c2da7c4
7179759: ENV: Nightly fails during jdk copiyng for solaris platforms after FDS unzipping
Summary: libjvm_g_db.so and libjvm_g_dtrace.so links in .diz file still had 64 directory
Reviewed-by: kamg, dholmes, sspitsyn
author | coleenp |
---|---|
date | Fri, 29 Jun 2012 14:28:10 -0700 |
parents | d1b0644d6acf |
children | 9024b6b53ec2 |
comparison
equal
deleted
inserted
replaced
6189:22de825d6faf | 6190:61a94c2da7c4 |
---|---|
135 ifeq ($(STRIP_POLICY),min_strip) | 135 ifeq ($(STRIP_POLICY),min_strip) |
136 $(QUIETLY) $(STRIP) -x $@ | 136 $(QUIETLY) $(STRIP) -x $@ |
137 # implied else here is no stripping at all | 137 # implied else here is no stripping at all |
138 endif | 138 endif |
139 endif | 139 endif |
140 [ -f $(XLIBJVM_DB_G_DEBUGINFO) ] || { ln -s $(XLIBJVM_DB_DEBUGINFO) $(XLIBJVM_DB_G_DEBUGINFO); } | 140 [ -f $(XLIBJVM_DB_G_DEBUGINFO) ] || { cd $(XLIBJVM_DIR) && ln -s $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB_G_DEBUGINFO); } |
141 ifeq ($(ZIP_DEBUGINFO_FILES),1) | 141 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
142 # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not | 142 # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not |
143 # in the archived name: | 143 # in the archived name: |
144 ( cd $(XLIBJVM_DIR) && $(ZIPEXE) -q -y $(LIBJVM_DB_DIZ) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB_G_DEBUGINFO) ) | 144 ( cd $(XLIBJVM_DIR) && $(ZIPEXE) -q -y $(LIBJVM_DB_DIZ) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB_G_DEBUGINFO) ) |
145 $(RM) $(XLIBJVM_DB_DEBUGINFO) $(XLIBJVM_DB_G_DEBUGINFO) | 145 $(RM) $(XLIBJVM_DB_DEBUGINFO) $(XLIBJVM_DB_G_DEBUGINFO) |
146 [ -f $(XLIBJVM_DB_G_DIZ) ] || { ln -s $(XLIBJVM_DB_DIZ) $(XLIBJVM_DB_G_DIZ); } | 146 [ -f $(XLIBJVM_DB_G_DIZ) ] || { cd $(XLIBJVM_DIR) && ln -s $(LIBJVM_DB_DIZ) $(LIBJVM_DB_G_DIZ); } |
147 endif | 147 endif |
148 endif | 148 endif |
149 | 149 |
150 $(XLIBJVM_DTRACE): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE) | 150 $(XLIBJVM_DTRACE): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE) |
151 @echo Making $@ | 151 @echo Making $@ |
168 ifeq ($(STRIP_POLICY),min_strip) | 168 ifeq ($(STRIP_POLICY),min_strip) |
169 $(QUIETLY) $(STRIP) -x $@ | 169 $(QUIETLY) $(STRIP) -x $@ |
170 # implied else here is no stripping at all | 170 # implied else here is no stripping at all |
171 endif | 171 endif |
172 endif | 172 endif |
173 [ -f $(XLIBJVM_DTRACE_G_DEBUGINFO) ] || { ln -s $(XLIBJVM_DTRACE_DEBUGINFO) $(XLIBJVM_DTRACE_G_DEBUGINFO); } | 173 [ -f $(XLIBJVM_DTRACE_G_DEBUGINFO) ] || { cd $(XLIBJVM_DIR) && ln -s $(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE_G_DEBUGINFO); } |
174 ifeq ($(ZIP_DEBUGINFO_FILES),1) | 174 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
175 # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not | 175 # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not |
176 # in the archived name: | 176 # in the archived name: |
177 ( cd $(XLIBJVM_DIR) && $(ZIPEXE) -q -y $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE_G_DEBUGINFO) ) | 177 ( cd $(XLIBJVM_DIR) && $(ZIPEXE) -q -y $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE_G_DEBUGINFO) ) |
178 $(RM) $(XLIBJVM_DTRACE_DEBUGINFO) $(XLIBJVM_DTRACE_G_DEBUGINFO) | 178 $(RM) $(XLIBJVM_DTRACE_DEBUGINFO) $(XLIBJVM_DTRACE_G_DEBUGINFO) |
179 [ -f $(XLIBJVM_DTRACE_G_DIZ) ] || { ln -s $(XLIBJVM_DTRACE_DIZ) $(XLIBJVM_DTRACE_G_DIZ); } | 179 [ -f $(XLIBJVM_DTRACE_G_DIZ) ] || { cd $(XLIBJVM_DIR) && ln -s $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_G_DIZ); } |
180 endif | 180 endif |
181 endif | 181 endif |
182 | 182 |
183 endif # ifneq ("${ISA}","${BUILDARCH}") | 183 endif # ifneq ("${ISA}","${BUILDARCH}") |
184 | 184 |