Mercurial > hg > truffle
comparison make/solaris/makefiles/vm.make @ 1547:fb1a39993f69
6951319: enable solaris builds using Sun Studio 12 update 1
Reviewed-by: kamg, ysr, dholmes, johnc
author | jcoomes |
---|---|
date | Tue, 18 May 2010 11:02:18 -0700 |
parents | 167c2986d91b |
children | c18cbe5936b8 |
comparison
equal
deleted
inserted
replaced
1546:a00b51b2dda4 | 1547:fb1a39993f69 |
---|---|
172 else | 172 else |
173 LINK_VM = $(LINK_LIB.CC) | 173 LINK_VM = $(LINK_LIB.CC) |
174 endif | 174 endif |
175 # making the library: | 175 # making the library: |
176 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) | 176 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) |
177 $(QUIETLY) \ | 177 ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) |
178 case "$(CFLAGS_BROWSE)" in \ | 178 @echo Linking vm... |
179 -sbfast|-xsbfast) \ | 179 $(QUIETLY) $(LINK_LIB.CC/PRE_HOOK) |
180 ;; \ | 180 $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM) |
181 *) \ | 181 $(QUIETLY) $(LINK_LIB.CC/POST_HOOK) |
182 echo Linking vm...; \ | 182 $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1 |
183 $(LINK_LIB.CC/PRE_HOOK) \ | 183 $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G) |
184 $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ | 184 $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1 |
185 $(LINK_LIB.CC/POST_HOOK) \ | 185 endif # filter -sbfast -xsbfast |
186 rm -f $@.1; ln -s $@ $@.1; \ | 186 |
187 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ | |
188 ;; \ | |
189 esac | |
190 | 187 |
191 DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) | 188 DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) |
192 | 189 |
193 install_jvm: $(LIBJVM) | 190 install_jvm: $(LIBJVM) |
194 @echo "Copying $(LIBJVM) to $(DEST_JVM)" | 191 @echo "Copying $(LIBJVM) to $(DEST_JVM)" |