Mercurial > hg > truffle
comparison make/defs.make @ 2237:b76d12f4ab2d
7018429: JPRT: Update Makefile to use ALT_JDK_TARGET_IMPORT_PATH for copying JDK
Summary: Set JDK_IMPORT_PATH to ALT_JDK_TARGET_IMPORT_PATH if it is defined
Reviewed-by: phh, ohair
author | dholmes |
---|---|
date | Mon, 14 Feb 2011 19:27:36 -0500 |
parents | c7db7adb83b4 |
children | f08d439fab8c |
comparison
equal
deleted
inserted
replaced
2235:54df4702df97 | 2237:b76d12f4ab2d |
---|---|
1 # | 1 # |
2 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. | 2 # Copyright (c) 2006, 2011, 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. |
158 | 158 |
159 # Find latest promoted JDK area | 159 # Find latest promoted JDK area |
160 JDK_IMPORT_PATH=$(SLASH_JAVA)/re/j2se/$(JDK_VERSION)/promoted/latest/binaries/$(PLATFORM) | 160 JDK_IMPORT_PATH=$(SLASH_JAVA)/re/j2se/$(JDK_VERSION)/promoted/latest/binaries/$(PLATFORM) |
161 ifneq ($(ALT_JDK_IMPORT_PATH),) | 161 ifneq ($(ALT_JDK_IMPORT_PATH),) |
162 JDK_IMPORT_PATH=$(ALT_JDK_IMPORT_PATH) | 162 JDK_IMPORT_PATH=$(ALT_JDK_IMPORT_PATH) |
163 endif | |
164 | |
165 # Other parts of JDK build may require an import JDK that can be executed | |
166 # on the build host. For cross-compile builds we also need an import JDK | |
167 # that matches the target arch, so for that we set ALT_JDK_TARGET_IMPORT_PATH | |
168 ifneq ($(ALT_JDK_TARGET_IMPORT_PATH),) | |
169 JDK_IMPORT_PATH=$(ALT_JDK_TARGET_IMPORT_PATH) | |
163 endif | 170 endif |
164 | 171 |
165 # Find JDK used for javac compiles | 172 # Find JDK used for javac compiles |
166 BOOTDIR=$(SLASH_JAVA)/re/j2se/$(PREVIOUS_JDK_VERSION)/latest/binaries/$(PLATFORM) | 173 BOOTDIR=$(SLASH_JAVA)/re/j2se/$(PREVIOUS_JDK_VERSION)/latest/binaries/$(PLATFORM) |
167 ifneq ($(ALT_BOOTDIR),) | 174 ifneq ($(ALT_BOOTDIR),) |