equal
deleted
inserted
replaced
279 EXPORT_JRE_DIR = $(EXPORT_PATH)/jre |
279 EXPORT_JRE_DIR = $(EXPORT_PATH)/jre |
280 EXPORT_JRE_BIN_DIR = $(EXPORT_JRE_DIR)/bin |
280 EXPORT_JRE_BIN_DIR = $(EXPORT_JRE_DIR)/bin |
281 EXPORT_JRE_LIB_DIR = $(EXPORT_JRE_DIR)/lib |
281 EXPORT_JRE_LIB_DIR = $(EXPORT_JRE_DIR)/lib |
282 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH) |
282 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH) |
283 |
283 |
|
284 # non-universal macosx builds need to appear universal |
|
285 ifeq ($(OS_VENDOR), Darwin) |
|
286 ifneq ($(MACOSX_UNIVERSAL), true) |
|
287 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR) |
|
288 endif |
|
289 endif |
|
290 |
284 # Common export list of files |
291 # Common export list of files |
285 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h |
292 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h |
286 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h |
293 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h |
287 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h |
294 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h |
288 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h |
295 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h |