makefiles/CopyFiles.gmk
Print this page
*** 300,310 ****
# to decide whether to use client or server by default). So when we have anything
# other than client and server we need to define a new jvm.cfg file.
# The main problem is deciding whether to use aliases for the VMs that are not
# present and the current position is that we add aliases for client and server, but
# not for minimal.
! # To do: should this also support, -zero and -zeroshark?
CLIENT_AND_SERVER := $(and $(findstring true,$(JVM_VARIANT_SERVER)),$(findstring true,$(JVM_VARIANT_CLIENT)))
ifeq ($(CLIENT_AND_SERVER), true)
# Use the committed jvm.cfg for this 32 bit setup (the minimal
--- 300,310 ----
# to decide whether to use client or server by default). So when we have anything
# other than client and server we need to define a new jvm.cfg file.
# The main problem is deciding whether to use aliases for the VMs that are not
# present and the current position is that we add aliases for client and server, but
# not for minimal.
! # To do: should this also support -zeroshark?
CLIENT_AND_SERVER := $(and $(findstring true,$(JVM_VARIANT_SERVER)),$(findstring true,$(JVM_VARIANT_CLIENT)))
ifeq ($(CLIENT_AND_SERVER), true)
# Use the committed jvm.cfg for this 32 bit setup (the minimal
*** 333,342 ****
--- 333,347 ----
else
ifeq ($(JVM_VARIANT_MINIMAL1), true)
$(PRINTF) "-minimal KNOWN\n">>$(@)
$(PRINTF) "-server ALIASED_TO -minimal\n">>$(@)
$(PRINTF) "-client ALIASED_TO -minimal\n">>$(@)
+ else
+ ifeq ($(JVM_VARIANT_ZERO), true)
+ $(PRINTF) "-server KNOWN\n">>$(@)
+ $(PRINTF) "-client IGNORE\n">>$(@)
+ endif
endif
endif
endif
endif