70
71 # Use separate macro calls in case the source files are not in the same
72 # directory.
73 $(eval $(call SetupCopyFiles,COPY_MSVCR, \
74 DEST := $(LIB_DST_DIR), \
75 FILES := $(MSVCR_DLL), \
76 MACRO := copy-and-chmod))
77
78 $(eval $(call SetupCopyFiles,COPY_MSVCP, \
79 DEST := $(LIB_DST_DIR), \
80 FILES := $(MSVCP_DLL), \
81 MACRO := copy-and-chmod))
82
83 TARGETS += $(COPY_MSVCR) $(COPY_MSVCP)
84 endif
85
86 ################################################################################
87 #
88 # How to install jvm.cfg.
89 #
90 ifeq ($(call check-jvm-variant, zero zeroshark), true)
91 JVMCFG_ARCH := zero
92 else
93 JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY)
94 endif
95
96 ifeq ($(OPENJDK_TARGET_OS), macosx)
97 JVMCFG_SRC := $(TOPDIR)/src/java.base/macosx/conf/$(JVMCFG_ARCH)/jvm.cfg
98 else
99 JVMCFG_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/$(JVMCFG_ARCH)/jvm.cfg
100 # Allow override by ALT_JVMCFG_SRC if it exists
101 JVMCFG_SRC := $(if $(wildcard $(ALT_JVMCFG_SRC)),$(ALT_JVMCFG_SRC),$(JVMCFG_SRC))
102 endif
103 JVMCFG := $(LIB_DST_DIR)/jvm.cfg
104
105 # To do: should this also support -zeroshark?
106
107 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
108 COPY_JVM_CFG_FILE := true
109 else
110 # On 32-bit machines we have three potential VMs: client, server and minimal.
111 # Historically we usually have both client and server and so that is what the
112 # committed jvm.cfg expects (including platform specific ergonomics switches
113 # to decide whether to use client or server by default). So when we have anything
114 # other than client and server we need to define a new jvm.cfg file.
115 # The main problem is deciding whether to use aliases for the VMs that are not
116 # present and the current position is that we add aliases for client and server, but
117 # not for minimal.
118 CLIENT_AND_SERVER := $(call check-jvm-variant, client)+$(call check-jvm-variant, server)
119 ifeq ($(CLIENT_AND_SERVER), true+true)
120 COPY_JVM_CFG_FILE := true
121 else
122 # For zero, the default jvm.cfg file is sufficient
123 ifeq ($(call check-jvm-variant, zero zeroshark), true)
124 COPY_JVM_CFG_FILE := true
125 endif
126 endif
127 endif
128
129 ifeq ($(COPY_JVM_CFG_FILE), true)
130 $(JVMCFG): $(JVMCFG_SRC)
131 $(call install-file)
132 else
133 $(JVMCFG):
134 $(MKDIR) -p $(@D)
135 $(RM) $(@)
136 # Now check for other permutations
137 ifeq ($(call check-jvm-variant, server), true)
138 $(PRINTF) "-server KNOWN\n">>$(@)
139 $(PRINTF) "-client ALIASED_TO -server\n">>$(@)
140 ifeq ($(call check-jvm-variant, minimal), true)
141 $(PRINTF) "-minimal KNOWN\n">>$(@)
142 endif
143 else
|
70
71 # Use separate macro calls in case the source files are not in the same
72 # directory.
73 $(eval $(call SetupCopyFiles,COPY_MSVCR, \
74 DEST := $(LIB_DST_DIR), \
75 FILES := $(MSVCR_DLL), \
76 MACRO := copy-and-chmod))
77
78 $(eval $(call SetupCopyFiles,COPY_MSVCP, \
79 DEST := $(LIB_DST_DIR), \
80 FILES := $(MSVCP_DLL), \
81 MACRO := copy-and-chmod))
82
83 TARGETS += $(COPY_MSVCR) $(COPY_MSVCP)
84 endif
85
86 ################################################################################
87 #
88 # How to install jvm.cfg.
89 #
90 ifeq ($(call check-jvm-variant, zero), true)
91 JVMCFG_ARCH := zero
92 else
93 JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY)
94 endif
95
96 ifeq ($(OPENJDK_TARGET_OS), macosx)
97 JVMCFG_SRC := $(TOPDIR)/src/java.base/macosx/conf/$(JVMCFG_ARCH)/jvm.cfg
98 else
99 JVMCFG_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/$(JVMCFG_ARCH)/jvm.cfg
100 # Allow override by ALT_JVMCFG_SRC if it exists
101 JVMCFG_SRC := $(if $(wildcard $(ALT_JVMCFG_SRC)),$(ALT_JVMCFG_SRC),$(JVMCFG_SRC))
102 endif
103 JVMCFG := $(LIB_DST_DIR)/jvm.cfg
104
105 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
106 COPY_JVM_CFG_FILE := true
107 else
108 # On 32-bit machines we have three potential VMs: client, server and minimal.
109 # Historically we usually have both client and server and so that is what the
110 # committed jvm.cfg expects (including platform specific ergonomics switches
111 # to decide whether to use client or server by default). So when we have anything
112 # other than client and server we need to define a new jvm.cfg file.
113 # The main problem is deciding whether to use aliases for the VMs that are not
114 # present and the current position is that we add aliases for client and server, but
115 # not for minimal.
116 CLIENT_AND_SERVER := $(call check-jvm-variant, client)+$(call check-jvm-variant, server)
117 ifeq ($(CLIENT_AND_SERVER), true+true)
118 COPY_JVM_CFG_FILE := true
119 else
120 # For zero, the default jvm.cfg file is sufficient
121 ifeq ($(call check-jvm-variant, zero), true)
122 COPY_JVM_CFG_FILE := true
123 endif
124 endif
125 endif
126
127 ifeq ($(COPY_JVM_CFG_FILE), true)
128 $(JVMCFG): $(JVMCFG_SRC)
129 $(call install-file)
130 else
131 $(JVMCFG):
132 $(MKDIR) -p $(@D)
133 $(RM) $(@)
134 # Now check for other permutations
135 ifeq ($(call check-jvm-variant, server), true)
136 $(PRINTF) "-server KNOWN\n">>$(@)
137 $(PRINTF) "-client ALIASED_TO -server\n">>$(@)
138 ifeq ($(call check-jvm-variant, minimal), true)
139 $(PRINTF) "-minimal KNOWN\n">>$(@)
140 endif
141 else
|