< prev index next >

make/bsd/makefiles/vm.make

Print this page

        

*** 140,153 **** #---------------------------------------------------------------------- # JVM JVM = jvm ifeq ($(OS_VENDOR), Darwin) ! LIBJVM = lib$(JVM).dylib CFLAGS += -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE ! LIBJVM_DEBUGINFO = lib$(JVM).dylib.dSYM LIBJVM_DIZ = lib$(JVM).diz else LIBJVM = lib$(JVM).so LIBJVM_DEBUGINFO = lib$(JVM).debuginfo --- 140,153 ---- #---------------------------------------------------------------------- # JVM JVM = jvm ifeq ($(OS_VENDOR), Darwin) ! LIBJVM = lib$(JVM).$(LIBRARY_SUFFIX) CFLAGS += -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE ! LIBJVM_DEBUGINFO = lib$(JVM).$(LIBRARY_SUFFIX).dSYM LIBJVM_DIZ = lib$(JVM).diz else LIBJVM = lib$(JVM).so LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
*** 259,268 **** --- 259,278 ---- { system ("cat mapfile_extra vm.def"); } \ else \ { print $$0 } \ }' > $@ < $(MAPFILE) + ifeq ($(BUILD_STATIC),true) + EXPORTED_SYMBOLS = libjvm.symbols + + libjvm.symbols : mapfile + $(CP) mapfile libjvm.symbols + + else + EXPORTED_SYMBOLS = + endif + mapfile_reorder : mapfile $(REORDERFILE) rm -f $@ cat $^ > $@ vm.def: $(Res_Files) $(Obj_Files)
*** 286,298 **** --- 296,310 ---- LIBJVM_MAPFILE$(LDNOMAP) = mapfile_reorder LFLAGS_VM$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE)) LFLAGS_VM += $(SONAMEFLAG:SONAME=$(LIBJVM)) ifeq ($(OS_VENDOR), Darwin) + ifneq ($(BUILD_STATIC),true) LFLAGS_VM += -Xlinker -rpath -Xlinker @loader_path/. LFLAGS_VM += -Xlinker -rpath -Xlinker @loader_path/.. LFLAGS_VM += -Xlinker -install_name -Xlinker @rpath/$(@F) + endif else LFLAGS_VM += -Wl,-z,defs endif # JVM is statically linked with libgcc[_s] and libstdc++; this is needed to
*** 343,361 **** --- 355,379 ---- } LD_SCRIPT_FLAG = -Wl,-T,$(LD_SCRIPT) endif $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT) + ifeq ($(BUILD_STATIC),true) + echo Linking static vm...; + $(LINK_LIB.CC) $@ $(LIBJVM.o) + else $(QUIETLY) { \ echo $(LOG_INFO) Linking vm...; \ $(LINK_LIB.CXX/PRE_HOOK) \ $(LINK_VM) $(LD_SCRIPT_FLAG) \ $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM); \ $(LINK_LIB.CXX/POST_HOOK) \ rm -f $@.1; ln -s $@ $@.1; \ } + endif + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ifeq ($(OS_VENDOR), Darwin) $(DSYMUTIL) $@ ifeq ($(ZIP_DEBUGINFO_FILES),1) $(ZIPEXE) -q -r -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
*** 408,421 **** #---------------------------------------------------------------------- ifeq ($(OS_VENDOR), Darwin) # no libjvm_db for macosx ! build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(BUILDLIBSAPROC) dtraceCheck echo "Doing vm.make build:" else ! build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) endif install: install_jvm install_jsig install_saproc .PHONY: default build install install_jvm --- 426,439 ---- #---------------------------------------------------------------------- ifeq ($(OS_VENDOR), Darwin) # no libjvm_db for macosx ! build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(BUILDLIBSAPROC) dtraceCheck $(EXPORTED_SYMBOLS) echo "Doing vm.make build:" else ! build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) $(EXPORTED_SYMBOLS) endif install: install_jvm install_jsig install_saproc .PHONY: default build install install_jvm
< prev index next >