make/solaris/makefiles/vm.make

changeset 1902
fb1a39993f69
parent 1558
167c2986d91b
child 1907
c18cbe5936b8
     1.1 --- a/make/solaris/makefiles/vm.make	Mon May 17 00:47:28 2010 -0700
     1.2 +++ b/make/solaris/makefiles/vm.make	Tue May 18 11:02:18 2010 -0700
     1.3 @@ -174,19 +174,16 @@
     1.4  endif
     1.5  # making the library:
     1.6  $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) 
     1.7 -	$(QUIETLY) \
     1.8 -	case "$(CFLAGS_BROWSE)" in \
     1.9 -	-sbfast|-xsbfast) \
    1.10 -	    ;; \
    1.11 -	*) \
    1.12 -	    echo Linking vm...; \
    1.13 -	    $(LINK_LIB.CC/PRE_HOOK) \
    1.14 -	    $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \
    1.15 -	    $(LINK_LIB.CC/POST_HOOK) \
    1.16 -	    rm -f $@.1; ln -s $@ $@.1; \
    1.17 -	    [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
    1.18 -	    ;; \
    1.19 -	esac
    1.20 +ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),)
    1.21 +	@echo Linking vm...
    1.22 +	$(QUIETLY) $(LINK_LIB.CC/PRE_HOOK)
    1.23 +	$(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM)
    1.24 +	$(QUIETLY) $(LINK_LIB.CC/POST_HOOK)
    1.25 +	$(QUIETLY) rm -f $@.1 && ln -s $@ $@.1
    1.26 +	$(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G)
    1.27 +	$(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1
    1.28 +endif # filter -sbfast -xsbfast
    1.29 +
    1.30  
    1.31  DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
    1.32  

mercurial