make/bsd/makefiles/defs.make

Print this page

        

*** 36,46 **** else ARCH_DATA_MODEL ?= 32 endif # zero ! ifeq ($(ZERO_BUILD), true) ifeq ($(ARCH_DATA_MODEL), 64) MAKE_ARGS += LP64=1 endif PLATFORM = bsd-zero VM_PLATFORM = bsd_$(subst i386,i486,$(ZERO_LIBARCH)) --- 36,46 ---- else ARCH_DATA_MODEL ?= 32 endif # zero ! ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) ifeq ($(ARCH_DATA_MODEL), 64) MAKE_ARGS += LP64=1 endif PLATFORM = bsd-zero VM_PLATFORM = bsd_$(subst i386,i486,$(ZERO_LIBARCH))
*** 122,131 **** --- 122,143 ---- PLATFORM = bsd-ppc VM_PLATFORM = bsd_ppc HS_ARCH = ppc endif + # On 32 bit bsd we build server and client, on 64 bit just server. + ifeq ($(JVM_VARIANTS),) + ifeq ($(ARCH_DATA_MODEL), 32) + JVM_VARIANTS:=client,server + JVM_VARIANT_CLIENT:=true + JVM_VARIANT_SERVER:=true + else + JVM_VARIANTS:=server + JVM_VARIANT_SERVER:=true + endif + endif + JDK_INCLUDE_SUBDIR=bsd # Library suffix OS_VENDOR:=$(shell uname -s) ifeq ($(OS_VENDOR),Darwin)
*** 144,163 **** EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar ! ifndef BUILD_CLIENT_ONLY ! EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt ! EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) endif ! ifneq ($(ZERO_BUILD), true) ! ifeq ($(ARCH_DATA_MODEL), 32) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) - endif endif # Serviceability Binaries # No SA Support for PPC, IA64, ARM or zero ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ --- 156,173 ---- EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar ! ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) ! EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt ! EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) endif ! ifeq ($(JVM_VARIANT_CLIENT),true) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) endif # Serviceability Binaries # No SA Support for PPC, IA64, ARM or zero ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \