Mercurial > hg > truffle

comparison make/defs.make @ 12356:359f7e70ae7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reduce HotSpot diff and fix previous merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 15:41:33 +0200
parents 836a62f43af9
children 096c224171c4
comparison
equal deleted inserted replaced
12355:cefad50507d8 12356:359f7e70ae7f
234 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM) 234 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM)
235 ifneq ($(ALT_JDK_IMAGE_DIR),) 235 ifneq ($(ALT_JDK_IMAGE_DIR),)
236 JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR) 236 JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
237 endif 237 endif
238 238
239 # The platform dependent defs.make defines platform specific variable such 239 # The platform dependent defs.make defines platform specific variable such
240 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined. 240 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined.
241 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make 241 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make
242 242
243 # We are trying to put platform specific defintions 243 # We are trying to put platform specific defintions
244 # files to make/$(OSNAME)/makefiles dictory. However 244 # files to make/$(OSNAME)/makefiles dictory. However