equal
deleted
inserted
replaced
104 ifeq ($(PLATFORM), windows) |
104 ifeq ($(PLATFORM), windows) |
105 # Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv Windows |
105 # Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv Windows |
106 |
106 |
107 # Add the Java Kernel VM to the import path, but only on windows 32-bit Windows |
107 # Add the Java Kernel VM to the import path, but only on windows 32-bit Windows |
108 ifeq ($(ARCH_DATA_MODEL), 32) |
108 ifeq ($(ARCH_DATA_MODEL), 32) |
109 IMPORT_LIST += $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVM_NAME) \ |
109 ifeq ($(DO_KERNEL), true) |
110 $(LIB_LOCATION)/$(KERNEL_LOCATION)/Xusage.txt |
110 IMPORT_LIST += $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVM_NAME) \ |
|
111 $(LIB_LOCATION)/$(KERNEL_LOCATION)/Xusage.txt |
|
112 endif |
111 endif |
113 endif |
112 |
114 |
113 IMPORT_LIST += $(MS_RUNTIME_LIBRARIES:%=$(BINDIR)/%) |
115 IMPORT_LIST += $(MS_RUNTIME_LIBRARIES:%=$(BINDIR)/%) |
114 |
116 |
115 # NOTE: These might actually come from BUILDDIR, depends on the settings. |
117 # NOTE: These might actually come from BUILDDIR, depends on the settings. |
129 # Add .map and .pdb files to the import path for client and kernel VMs. |
131 # Add .map and .pdb files to the import path for client and kernel VMs. |
130 # These are only available on 32-bit windows builds. |
132 # These are only available on 32-bit windows builds. |
131 ifeq ($(ARCH_DATA_MODEL), 32) |
133 ifeq ($(ARCH_DATA_MODEL), 32) |
132 IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME) \ |
134 IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME) \ |
133 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME) |
135 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME) |
134 IMPORT_LIST += $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMMAP_NAME) \ |
136 ifeq ($(DO_KERNEL), true) |
135 $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMPDB_NAME) |
137 IMPORT_LIST += $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMMAP_NAME) \ |
|
138 $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMPDB_NAME) |
|
139 endif |
136 endif |
140 endif |
137 |
141 |
138 $(LIBDIR)/$(JVMLIB_NAME): $(HOTSPOT_LIB_PATH)/$(JVMLIB_NAME) |
142 $(LIBDIR)/$(JVMLIB_NAME): $(HOTSPOT_LIB_PATH)/$(JVMLIB_NAME) |
139 $(install-import-file) |
143 $(install-import-file) |
140 |
144 |