From: OpenJDK Team Date: Wed, 22 Jan 2025 07:58:11 +0000 (+0100) Subject: compile-preview X-Git-Tag: archive/raspbian/21.0.6+7-1+rpi1^2~13 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a350c45ccf01875c65bc34e2d21dc2180dabbdef;p=openjdk-21.git compile-preview Gbp-Pq: Name compile-preview.diff --- diff --git a/make/CompileInterimLangtools.gmk b/make/CompileInterimLangtools.gmk index bbc2d1036..7b20b9d6d 100644 --- a/make/CompileInterimLangtools.gmk +++ b/make/CompileInterimLangtools.gmk @@ -80,6 +80,16 @@ $(eval $(call SetupCopyFiles, COPY_PREVIEW_FEATURES, \ TARGETS += $(COPY_PREVIEW_FEATURES) +$(eval $(call SetupJavaCompilation, COMPILE_PREVIEW_FEATURES, \ + COMPILER := bootjdk, \ + TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \ + EXTRA_FILES := $(TOPDIR)/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java \ + $(TOPDIR)/src/java.base/share/classes/jdk/internal/javac/NoPreview.java, \ + BIN := $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim/jdk/internal/javac/, \ +)) + +TARGETS += $(COMPILE_PREVIEW_FEATURES) + ################################################################################ # Setup the rules to build interim langtools, which is compiled by the boot # javac and can be run on the boot jdk. This will be used to compile the rest of @@ -118,7 +128,7 @@ define SetupInterimModule $1_DEPS_INTERIM := $$(addsuffix .interim, $$(filter \ $$(INTERIM_LANGTOOLS_BASE_MODULES), $$(call FindTransitiveDepsForModule, $1))) - $$(BUILD_$1.interim): $$(foreach d, $$($1_DEPS_INTERIM), $$(BUILD_$$d)) $(COPY_PREVIEW_FEATURES) + $$(BUILD_$1.interim): $$(foreach d, $$($1_DEPS_INTERIM), $$(BUILD_$$d)) $(COPY_PREVIEW_FEATURES) $(COMPILE_PREVIEW_FEATURES) TARGETS += $$(BUILD_$1.interim) endef