OpenJDK / jdk / jdk
changeset 9458:ce053192ba78
Merge
| author | andrew |
|---|---|
| date | Fri, 06 May 2011 02:27:10 +0100 |
| parents | 57358dca0845 bd61a5644705 |
| children | b8ccb6a8a5d3 221b61a6082b |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/common/Program.gmk Fri May 06 01:55:29 2011 +0100 +++ b/jdk/make/common/Program.gmk Fri May 06 02:27:10 2011 +0100 @@ -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
--- a/jdk/make/common/shared/Defs-utils.gmk Fri May 06 01:55:29 2011 +0100 +++ b/jdk/make/common/shared/Defs-utils.gmk Fri May 06 02:27:10 2011 +0100 @@ -109,6 +109,8 @@ GDB = $(UTILS_USR_BIN_PATH)gdb GREP = $(UTILS_COMMAND_PATH)grep GUNZIP = $(UTILS_COMMAND_PATH)gunzip +# GZIP is used for solaris. Linux and windows use tar czf +GZIP = $(UTILS_COMMAND_PATH)gzip HEAD = $(UTILS_USR_BIN_PATH)head HG = hg ID = $(UTILS_COMMAND_PATH)id