Mercurial > hg > truffle

comparison make/defs.make @ 4006:436b4a3231bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7098194: integrate macosx-port changes Summary: Integrate bsd-port/hotspot and macosx-port/hotspot changes as of 2011.09.29. Reviewed-by: kvn, dholmes, never, phh Contributed-by: Christos Zoulas <christos@zoulas.com>, Greg Lewis <glewis@eyesbeyond.com>, Kurt Miller <kurt@intricatesoftware.com>, Alexander Strange <astrange@apple.com>, Mike Swingler <swingler@apple.com>, Roger Hoover <rhoover@apple.com>, Victor Hernandez <vhernandez@apple.com>, Pratik Solanki <psolanki@apple.com>
author dcubed
date Thu, 13 Oct 2011 09:35:42 -0700
parents f08d439fab8c
children 94ec88ca68e2
comparison
equal deleted inserted replaced
4005:2ef3386478e6 4006:436b4a3231bf
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