Mercurial > hg > truffle

comparison make/bsd/makefiles/defs.make @ 4886:64b46f975ab8 hs23-b14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7142616: MAC: Honor ALT_EXPORT_PATH overrides from JDK control builds Summary: Fix EXPORT_PATH overrides on Mac OS X and only change default. Reviewed-by: phh, dcubed Contributed-by: james.melvin@oracle.com
author phh
date Mon, 06 Feb 2012 14:02:51 -0500
parents 481a9443f721
children f09ae3853e3b
comparison
equal deleted inserted replaced
4885:585feefad374 4886:64b46f975ab8
183 # Universal settings 183 # Universal settings
184 ifeq ($(MACOSX_UNIVERSAL), true) 184 ifeq ($(MACOSX_UNIVERSAL), true)
185 185
186 # Set universal export path but avoid using ARCH or PLATFORM subdirs 186 # Set universal export path but avoid using ARCH or PLATFORM subdirs
187 EXPORT_PATH=$(OUTPUTDIR)/export-universal$(EXPORT_SUBDIR) 187 EXPORT_PATH=$(OUTPUTDIR)/export-universal$(EXPORT_SUBDIR)
188 ifneq ($(ALT_EXPORT_PATH),)
189 EXPORT_PATH=$(ALT_EXPORT_PATH)
190 endif
188 191
189 # Set universal image dir 192 # Set universal image dir
190 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-universal$(EXPORT_SUBDIR) 193 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-universal$(EXPORT_SUBDIR)
191 194
192 # Binaries to 'universalize' if built 195 # Binaries to 'universalize' if built