mirror of
https://github.com/openjdk/jdk.git
synced 2026-02-04 07:28:22 +00:00
Merge
This commit is contained in:
commit
36d63fdbf5
@ -114,3 +114,4 @@ ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134
|
||||
7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137
|
||||
fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138
|
||||
7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139
|
||||
dcfe74f1c6553c556e7d361c30b0b614eb5e40f6 jdk7-b140
|
||||
|
||||
10
Makefile
10
Makefile
@ -97,7 +97,7 @@ define StopTimer
|
||||
endef
|
||||
|
||||
# Generic build of basic repo series
|
||||
generic_build_repo_series::
|
||||
generic_build_repo_series:: $(SOURCE_TIPS)
|
||||
$(MKDIR) -p $(OUTPUTDIR)
|
||||
$(MKDIR) -p $(OUTPUTDIR)/j2sdk-image
|
||||
@$(call StartTimer)
|
||||
@ -243,6 +243,14 @@ product_build:: build_product_image
|
||||
debug_build:: build_debug_image
|
||||
fastdebug_build:: build_fastdebug_image
|
||||
|
||||
# The source tips are stored with the relative path to the repo.
|
||||
# This file will be used when constructing the jdk image.
|
||||
source_tips: $(SOURCE_TIPS)
|
||||
$(CAT) $<
|
||||
$(SOURCE_TIPS): FRC
|
||||
@$(prep-target)
|
||||
@$(call GetSourceTips)
|
||||
|
||||
clobber:: REPORT_BUILD_TIMES=
|
||||
clobber::
|
||||
$(RM) -r $(OUTPUTDIR)/*
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user