Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7041284: arm/ppc Missing launcher mapfiles prevent build
authordholmes
Wed, 04 May 2011 22:16:28 -0400
changeset 9455 5675b83ad5eb
parent 9398 5d86d0c7692e
child 9456 bd61a5644705
child 9561 8f5e2b975fa2
7041284: arm/ppc Missing launcher mapfiles prevent build Summary: Disable use of launcher mapfiles when cross-compiling Reviewed-by: ohair, ksrini
jdk/make/common/Program.gmk file | annotate | diff | comparison | revisions 
--- 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
jdk-sandbox