equal
deleted
inserted
replaced
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),) |