Mercurial > hg > graal-compiler
comparison make/defs.make @ 4865:481a9443f721
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
Summary: Add support for packaging HotSpot JVM builds in universal binaries
Reviewed-by: dholmes, kamg, dcubed, phh
Contributed-by: james.melvin@oracle.com
author | phh |
---|---|
date | Wed, 01 Feb 2012 15:01:08 -0500 |
parents | 94ec88ca68e2 |
children | f09ae3853e3b |
comparison
equal
deleted
inserted
replaced
4864:b2cd0ee8f778 | 4865:481a9443f721 |
---|---|
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. |
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 | 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) | |
187 | 196 |
188 # The platform dependent defs.make defines platform specific variable such | 197 # 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. | 198 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined. |
190 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make | 199 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make |
191 | 200 |
261 # Pass HOTSPOT_BUILD_VERSION as argument to OS specific Makefile | 270 # Pass HOTSPOT_BUILD_VERSION as argument to OS specific Makefile |
262 # to overwrite the default definition since OS specific Makefile also | 271 # to overwrite the default definition since OS specific Makefile also |
263 # includes this make/defs.make file. | 272 # includes this make/defs.make file. |
264 MAKE_ARGS += HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) | 273 MAKE_ARGS += HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) |
265 | 274 |
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 | 275 # Various export sub directories |
276 EXPORT_INCLUDE_DIR = $(EXPORT_PATH)/include | 276 EXPORT_INCLUDE_DIR = $(EXPORT_PATH)/include |
277 EXPORT_DOCS_DIR = $(EXPORT_PATH)/docs | 277 EXPORT_DOCS_DIR = $(EXPORT_PATH)/docs |
278 EXPORT_LIB_DIR = $(EXPORT_PATH)/lib | 278 EXPORT_LIB_DIR = $(EXPORT_PATH)/lib |
279 EXPORT_JRE_DIR = $(EXPORT_PATH)/jre | 279 EXPORT_JRE_DIR = $(EXPORT_PATH)/jre |