From 3530d24940e2d9d6a1cd340c8a8cfa88791c96b0 Mon Sep 17 00:00:00 2001 From: Saint Wesonga Date: Wed, 27 Mar 2024 07:42:34 -0600 Subject: [PATCH 1/2] Fix 'No rule to make target .../windows/conf/tzmappings' error --- make/Main.gmk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/make/Main.gmk b/make/Main.gmk index 2c08532626a..2adc5b622df 100644 --- a/make/Main.gmk +++ b/make/Main.gmk @@ -109,6 +109,17 @@ ALL_TARGETS += generate-exported-symbols # When creating a BUILDJDK, the java targets have already been built and copied # into the buildjdk so no need to generate sources. ifneq ($(CREATING_BUILDJDK), true) + GENERATE_BUILDJDK_SOURCES := true +else ifeq ($(OPENJDK_TARGET_OS)+$(COMPILE_TYPE), windows+cross) + # Windows AArch64 is built by cross compiling. Therefore, the buildjdk sources + # need to be generated unconditionally to avoid a 'No rule to make target + # windows/conf/tzmappings' error + GENERATE_BUILDJDK_SOURCES := true +else + GENERATE_BUILDJDK_SOURCES := +endif + +ifeq ($(GENERATE_BUILDJDK_SOURCES), true) $(eval $(call DeclareRecipesForPhase, GENSRC, \ TARGET_SUFFIX := gensrc-src, \ FILE_PREFIX := Gensrc, \ @@ -765,7 +776,7 @@ else # Skip modules that do not have java source. # When creating a BUILDJDK, the java compilation has already been done by the # normal build and copied in. - ifneq ($(CREATING_BUILDJDK), true) + ifeq ($(GENERATE_BUILDJDK_SOURCES), true) $(foreach m, $(filter $(JAVA_MODULES), $(LIBS_MODULES)), $(eval $m-libs: $m-java)) endif From 862818a89526353447fa654aba0bb77a57d22d15 Mon Sep 17 00:00:00 2001 From: Saint Wesonga Date: Tue, 16 Jul 2024 15:51:40 -0600 Subject: [PATCH 2/2] Fix whitespace offset --- make/Main.gmk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/Main.gmk b/make/Main.gmk index 2adc5b622df..6adf9d6d1d3 100644 --- a/make/Main.gmk +++ b/make/Main.gmk @@ -111,9 +111,9 @@ ALL_TARGETS += generate-exported-symbols ifneq ($(CREATING_BUILDJDK), true) GENERATE_BUILDJDK_SOURCES := true else ifeq ($(OPENJDK_TARGET_OS)+$(COMPILE_TYPE), windows+cross) - # Windows AArch64 is built by cross compiling. Therefore, the buildjdk sources - # need to be generated unconditionally to avoid a 'No rule to make target - # windows/conf/tzmappings' error + # Windows AArch64 is built by cross compiling. Therefore, the buildjdk sources + # need to be generated unconditionally to avoid a 'No rule to make target + # windows/conf/tzmappings' error GENERATE_BUILDJDK_SOURCES := true else GENERATE_BUILDJDK_SOURCES :=