Mercurial > hg > truffle

comparison make/defs.make @ 4988:eb5b24d1499f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Christian Haeubl <christian.haeubl@oracle.com>
date Mon, 27 Feb 2012 15:06:36 -0800
parents f09ae3853e3b
children 7292cff45988
comparison
equal deleted inserted replaced
4987:f292f9c590ba 4988:eb5b24d1499f
1 # 1 #
2 # Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
181 181
182 # Find JDK used for javac compiles 182 # Find JDK used for javac compiles
183 BOOTDIR=$(SLASH_JAVA)/re/j2se/$(PREVIOUS_JDK_VERSION)/latest/binaries/$(PLATFORM) 183 BOOTDIR=$(SLASH_JAVA)/re/j2se/$(PREVIOUS_JDK_VERSION)/latest/binaries/$(PLATFORM)
184 ifneq ($(ALT_BOOTDIR),) 184 ifneq ($(ALT_BOOTDIR),)
185 BOOTDIR=$(ALT_BOOTDIR) 185 BOOTDIR=$(ALT_BOOTDIR)
186 endif
187
188 # Select name of the export directory and honor ALT overrides
189 EXPORT_PATH=$(OUTPUTDIR)/export-$(PLATFORM)$(EXPORT_SUBDIR)
190 ifneq ($(ALT_EXPORT_PATH),)
191 EXPORT_PATH=$(ALT_EXPORT_PATH)
192 endif
193
194 # Default jdk image if one is created for you with create_jdk
195 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM)
196 ifneq ($(ALT_JDK_IMAGE_DIR),)
197 JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
186 endif 198 endif
187 199
188 # The platform dependent defs.make defines platform specific variable such 200 # The platform dependent defs.make defines platform specific variable such
189 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined. 201 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined.
190 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make 202 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make
261 # Pass HOTSPOT_BUILD_VERSION as argument to OS specific Makefile 273 # Pass HOTSPOT_BUILD_VERSION as argument to OS specific Makefile
262 # to overwrite the default definition since OS specific Makefile also 274 # to overwrite the default definition since OS specific Makefile also
263 # includes this make/defs.make file. 275 # includes this make/defs.make file.
264 MAKE_ARGS += HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) 276 MAKE_ARGS += HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION)
265 277
266 # Select name of export directory
267 EXPORT_PATH=$(OUTPUTDIR)/export-$(PLATFORM)$(EXPORT_SUBDIR)
268 ifneq ($(ALT_EXPORT_PATH),)
269 EXPORT_PATH=$(ALT_EXPORT_PATH)
270 endif
271
272 # Default jdk image if one is created for you with create_jdk
273 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM)
274
275 # Various export sub directories 278 # Various export sub directories
276 EXPORT_INCLUDE_DIR = $(EXPORT_PATH)/include 279 EXPORT_INCLUDE_DIR = $(EXPORT_PATH)/include
277 EXPORT_DOCS_DIR = $(EXPORT_PATH)/docs 280 EXPORT_DOCS_DIR = $(EXPORT_PATH)/docs
278 EXPORT_LIB_DIR = $(EXPORT_PATH)/lib 281 EXPORT_LIB_DIR = $(EXPORT_PATH)/lib
279 EXPORT_JRE_DIR = $(EXPORT_PATH)/jre 282 EXPORT_JRE_DIR = $(EXPORT_PATH)/jre
292 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h 295 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h
293 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h 296 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h
294 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h 297 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h
295 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h 298 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h
296 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h 299 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h
300
301 ifndef JAVASE_EMBEDDED
302 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jfr.h
303 endif