1.1 --- a/make/defs.make Mon Feb 14 03:19:33 2011 -0800
1.2 +++ b/make/defs.make Mon Feb 14 19:27:36 2011 -0500
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -162,6 +162,13 @@
1.11 JDK_IMPORT_PATH=$(ALT_JDK_IMPORT_PATH)
1.12 endif
1.13
1.14 +# Other parts of JDK build may require an import JDK that can be executed
1.15 +# on the build host. For cross-compile builds we also need an import JDK
1.16 +# that matches the target arch, so for that we set ALT_JDK_TARGET_IMPORT_PATH
1.17 +ifneq ($(ALT_JDK_TARGET_IMPORT_PATH),)
1.18 + JDK_IMPORT_PATH=$(ALT_JDK_TARGET_IMPORT_PATH)
1.19 +endif
1.20 +
1.21 # Find JDK used for javac compiles
1.22 BOOTDIR=$(SLASH_JAVA)/re/j2se/$(PREVIOUS_JDK_VERSION)/latest/binaries/$(PLATFORM)
1.23 ifneq ($(ALT_BOOTDIR),)
