Mercurial > hg > truffle

comparison make/bsd/makefiles/defs.make @ 4940:f09ae3853e3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk Reviewed-by: rbackman, jrose, dholmes
author twisti
date Mon, 13 Feb 2012 04:30:59 -0800
parents 64b46f975ab8
children 2d503de963b3
comparison
equal deleted inserted replaced
4939:45a1bf98f1bb 4940:f09ae3853e3b
189 EXPORT_PATH=$(ALT_EXPORT_PATH) 189 EXPORT_PATH=$(ALT_EXPORT_PATH)
190 endif 190 endif
191 191
192 # Set universal image dir 192 # Set universal image dir
193 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-universal$(EXPORT_SUBDIR) 193 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-universal$(EXPORT_SUBDIR)
194 ifneq ($(ALT_JDK_IMAGE_DIR),)
195 JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
196 endif
194 197
195 # Binaries to 'universalize' if built 198 # Binaries to 'universalize' if built
196 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX) 199 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX)
197 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX) 200 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX)
198 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX) 201 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX)