# HG changeset patch # User dholmes # Date 1304561788 14400 # Node ID 5675b83ad5ebc8872077a01d82157a2d46e0d0eb # Parent 5d86d0c7692e8f4a58d430d68c03594e2d3403b3 7041284: arm/ppc Missing launcher mapfiles prevent build Summary: Disable use of launcher mapfiles when cross-compiling Reviewed-by: ohair, ksrini diff -r 5d86d0c7692e -r 5675b83ad5eb jdk/make/common/Program.gmk --- a/jdk/make/common/Program.gmk Wed Jul 05 17:43:08 2017 +0200 +++ b/jdk/make/common/Program.gmk Wed May 04 22:16:28 2011 -0400 @@ -55,10 +55,13 @@ program: $(ACTUAL_PROGRAM) -# reuse the mapfiles in the launcher's directory, the same should -# be applicable to the tool launchers as well. -FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH) -include $(BUILDDIR)/common/Mapfile-vers.gmk +# Work-around for missing processor specific mapfiles +ifndef CROSS_COMPILE_ARCH + # reuse the mapfiles in the launcher's directory, the same should + # be applicable to the tool launchers as well. + FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH) + include $(BUILDDIR)/common/Mapfile-vers.gmk +endif include $(JDK_TOPDIR)/make/common/Rules.gmk