make/lib/Lib-java.base.gmk
changeset 58846 f9ac726ab347
parent 57796 56df9a08ed9c
equal deleted inserted replaced
58845:e492513d3630 58846:f9ac726ab347
   146 
   146 
   147     TARGETS += $(BUILD_LIBJSIG)
   147     TARGETS += $(BUILD_LIBJSIG)
   148 
   148 
   149     ############################################################################
   149     ############################################################################
   150     # Create symlinks to libjsig in each JVM variant sub dir
   150     # Create symlinks to libjsig in each JVM variant sub dir
   151     LIB_OUTPUTDIR := $(call FindLibDirForModule, java.base)
   151     ifneq ($(STATIC_LIBS), true)
   152 
   152       LIB_OUTPUTDIR := $(call FindLibDirForModule, java.base)
   153     # $1 variant subdir
   153 
   154     define CreateSymlinks
   154       # $1 variant subdir
   155       # Always symlink from libdir/variant/libjsig.so -> ../libjsig.so.
   155       define CreateSymlinks
   156       $(LIB_OUTPUTDIR)/$1/$(call SHARED_LIBRARY,jsig): \
   156         # Always symlink from libdir/variant/libjsig.so -> ../libjsig.so.
   157           $(LIB_OUTPUTDIR)/$(call SHARED_LIBRARY,jsig)
   157         $(LIB_OUTPUTDIR)/$1/$(call SHARED_LIBRARY,jsig): \
       
   158             $(LIB_OUTPUTDIR)/$(call SHARED_LIBRARY,jsig)
   158 		$$(call MakeDir, $$(@D))
   159 		$$(call MakeDir, $$(@D))
   159 		$(RM) $$@
   160 		$(RM) $$@
   160 		$(LN) -s ../$$(@F) $$@
   161 		$(LN) -s ../$$(@F) $$@
   161 
   162 
   162       TARGETS += $(LIB_OUTPUTDIR)/$1/$(call SHARED_LIBRARY,jsig)
   163         TARGETS += $(LIB_OUTPUTDIR)/$1/$(call SHARED_LIBRARY,jsig)
   163     endef
   164       endef
   164 
   165 
   165     # The subdir is the same as the variant for client and minimal, for all
   166       # The subdir is the same as the variant for client and minimal, for all
   166     # others it's server.
   167       # others it's server.
   167     VARIANT_SUBDIRS := $(filter client minimal, $(JVM_VARIANTS)) \
   168       VARIANT_SUBDIRS := $(filter client minimal, $(JVM_VARIANTS)) \
   168         $(if $(filter-out client minimal, $(JVM_VARIANTS)), server)
   169           $(if $(filter-out client minimal, $(JVM_VARIANTS)), server)
   169     $(foreach v, $(VARIANT_SUBDIRS), $(eval $(call CreateSymlinks,$v)))
   170       $(foreach v, $(VARIANT_SUBDIRS), $(eval $(call CreateSymlinks,$v)))
   170 
   171     endif
   171     ############################################################################
   172     ############################################################################
   172 
   173 
   173   endif
   174   endif
   174 endif
   175 endif
   175 
   176