Merge
This commit is contained in:
commit
f0226e0dc5
@ -216,3 +216,4 @@ cb51fb4789ac0b8be4056482077ddfb8f3bd3805 jdk8-b91
|
||||
3a36c926a7aafa9d4a892a45ef3678e87ad8359b jdk8-b92
|
||||
27c51c6e31c1ef36afa0e6efb031f9b13f26c12b jdk8-b93
|
||||
50d2bde060f2a9bbbe4da0c8986e20aca61f2e2e jdk8-b94
|
||||
785d07fe38901ecc1b7e0145e53e1c3da9361fee jdk8-b95
|
||||
|
@ -355,12 +355,24 @@
|
||||
</li>
|
||||
<li>
|
||||
Install a
|
||||
<a name="bootjdk">Bootstrap JDK</a>
|
||||
<br>
|
||||
<a name="bootjdk">Bootstrap JDK</a>.
|
||||
All OpenJDK builds require access to a previously released
|
||||
JDK, this is often called a bootstrap JDK.
|
||||
Currently, for this JDK release we require
|
||||
JDK 7 Update 7 or newer.
|
||||
JDK called the <i>bootstrap JDK</i> or <i>boot JDK.</i>
|
||||
The general rule is that the bootstrap JDK
|
||||
must be an instance of the previous major
|
||||
release of the JDK. In addition, there may be
|
||||
a requirement to use a release at or beyond a
|
||||
particular update level.
|
||||
<br> <br>
|
||||
|
||||
<b><i>Building JDK 8 requires use of a version
|
||||
of JDK 7 that is at Update 7 or newer. JDK 8
|
||||
developers should not use JDK 8 as the boot
|
||||
JDK, to ensure that JDK 8 dependencies are
|
||||
not introduced into the parts of the system
|
||||
that are built with JDK 7.</i></b>
|
||||
|
||||
<br> <br>
|
||||
The JDK 7 binaries can be downloaded from Oracle's
|
||||
<a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
|
||||
target="_blank">JDK 7 download site</a>.
|
||||
|
@ -183,7 +183,7 @@ bootcycle-images-only: start-make
|
||||
test: images test-only
|
||||
test-only: start-make
|
||||
@$(call TargetEnter)
|
||||
@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k JT_HOME=$(JT_HOME) MAKEFLAGS= PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
|
||||
@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
|
||||
@$(call TargetExit)
|
||||
|
||||
# Stores the tips for each repository. This file is be used when constructing the jdk image and can be
|
||||
@ -192,7 +192,7 @@ source-tips: $(OUTPUT_ROOT)/source_tips
|
||||
$(OUTPUT_ROOT)/source_tips: FRC
|
||||
@$(MKDIR) -p $(@D)
|
||||
@$(RM) $@
|
||||
@$(if $(HG),$(call GetSourceTips),$(ECHO) "hg not installed" > $@)
|
||||
@$(call GetSourceTips)
|
||||
|
||||
|
||||
# Remove everything, except the output from configure.
|
||||
|
Loading…
x
Reference in New Issue
Block a user