Changeset 303

Timestamp:

Jun 27, 2011, 5:54:53 PM (14 years ago)

Author:

dmik

Message:

jdk/make: Support situations when the version number printed by "java -version" is located at the second line of input, not only the first one.

File:

• trunk/openjdk/jdk/make/common/shared/Sanity.gmk (modified) (1 diff)

trunk/openjdk/jdk/make/common/shared/Sanity.gmk

@@ -106 +106 @@
 _ZIP_VER   :=$(shell $(ZIPEXE) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^Zip')
 _UNZIP_VER :=$(shell $(UNZIP)  -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^UnZip')
-_BOOT_VER  :=$(shell $(BOOTDIR)/bin/java -version 2>&1 | $(HEAD) -n 1)
+_BOOT_VER  :=$(shell $(BOOTDIR)/bin/java -version 2>&1 | $(HEAD) -n 2 | $(EGREP) 'version')
 MAKE_VER   :=$(call GetVersion,"$(_MAKE_VER)")
 ZIP_VER    :=$(call GetVersion,"$(_ZIP_VER)")