Skip to content

8329348: jdk11u build for Windows AArch64 fails #2668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

8329348: jdk11u build for Windows AArch64 fails #2668

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3530d24
Fix 'No rule to make target .../windows/conf/tzmappings' error
swesonga Mar 27, 2024
862818a
Fix whitespace offset
swesonga Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion make/Main.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, \
Expand Down Expand Up @@ -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

Expand Down