OpenJDK / jigsaw / jake / jdk
changeset 7929:c442171f1d17
8023460: OPENJDK build fails due to missing jfr.jar
Reviewed-by: alanb
| author | dholmes |
|---|---|
| date | Wed, 21 Aug 2013 05:56:46 -0400 |
| parents | 3bd5eb5a545f |
| children | 6bf99c2519a3 |
| files | makefiles/Profiles.gmk |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/makefiles/Profiles.gmk Wed Aug 28 16:31:41 2013 -0700 +++ b/makefiles/Profiles.gmk Wed Aug 21 05:56:46 2013 -0400 @@ -65,10 +65,6 @@ $(if $(PROFILE_2_JRE_JAR_FILES), $(addprefix $(IMAGES_OUTPUTDIR)/lib/, $(PROFILE_2_JRE_JAR_FILES))) \ $(PROFILE_1_JARS) -ifneq ($(ENABLE_JFR), true) - PROFILE_3_JRE_JAR_FILES := $(filter-out jfr.jar, $(PROFILE_3_JRE_JAR_FILES)) -endif - PROFILE_3_JARS := \ $(addprefix $(IMAGES_OUTPUTDIR)/lib/, $(PROFILE_3_JRE_JAR_FILES)) \ $(PROFILE_2_JARS) @@ -77,6 +73,10 @@ FULL_JRE_JAR_FILES := $(filter-out alt-rt.jar, $(FULL_JRE_JAR_FILES)) endif +ifneq ($(ENABLE_JFR), true) + FULL_JRE_JAR_FILES := $(filter-out jfr.jar, $(FULL_JRE_JAR_FILES)) +endif + FULL_JRE_JARS := \ $(addprefix $(IMAGES_OUTPUTDIR)/lib/, $(FULL_JRE_JAR_FILES)) \ $(PROFILE_3_JARS)