Mercurial > hg > release > icedtea7-forest-2.0 > jdk
changeset 4530:55a2cf00dc6a
PR770 Zero 7033954 regression: missing mapfile
2011-06-11 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 | Thu, 11 Aug 2011 15:00:46 +0200 |
| parents | 4da6bd3bb35e |
| children | 18e4e42d9d6d |
| files | make/common/Program.gmk |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/Program.gmk Thu Aug 04 05:09:19 2011 +0100 +++ b/make/common/Program.gmk Thu Aug 11 15:00:46 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