changeset 4556:0ee89fb1c10a

PR770 Zero 7033954 regression: missing mapfile 2011-08-24 Xerxes Ranby <xerxes@zafena.se> Matthias Klose <doko@ubuntu.com> * make/common/Program.gmk: don't assume that mapfiles are available for every architecture; most likely only seen with some zero builds.
author Xerxes Ranby <xerxes@zafena.se>
date Wed, 24 Aug 2011 15:15:30 +0200
parents f3833e8bf0d0
children 9a59860aaccb
files make/common/Program.gmk
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/Program.gmk	Fri Jul 29 16:02:39 2011 -0400
+++ b/make/common/Program.gmk	Wed Aug 24 15:15:30 2011 +0200
@@ -56,12 +56,14 @@
 program: $(ACTUAL_PROGRAM)
 
 # Work-around for missing processor specific mapfiles
+ifneq (,$(filter $(ARCH), amd64 i586 sparc sparcv9))
 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
+endif
 
 include $(JDK_TOPDIR)/make/common/Rules.gmk