1.1 --- a/make/defs.make Mon Oct 10 21:01:36 2011 -0400
1.2 +++ b/make/defs.make Thu Oct 13 09:35:42 2011 -0700
1.3 @@ -281,6 +281,13 @@
1.4 EXPORT_JRE_LIB_DIR = $(EXPORT_JRE_DIR)/lib
1.5 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH)
1.6
1.7 +# non-universal macosx builds need to appear universal
1.8 +ifeq ($(OS_VENDOR), Darwin)
1.9 + ifneq ($(MACOSX_UNIVERSAL), true)
1.10 + EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)
1.11 + endif
1.12 +endif
1.13 +
1.14 # Common export list of files
1.15 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h
1.16 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h
