Mercurial > hg > release > icedtea7-2.0
changeset 2455:76c688f49231
Test whether javah supports -X and only filter if not.
2011-07-13 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(bootstrap-directory-stage1): Only use
javah script to ignore -X options if unsupported.
* acinclude.m4:
(IT_JAVAH): Extend to check whether javah supports
-Xbootclasspath and set JAVAH_SUPPORTS_X_OPTIONS if
so.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 13 Jul 2011 22:36:33 +0100 |
| parents | 71fb0f9294cb |
| children | db4c20941851 |
| files | ChangeLog Makefile.am acinclude.m4 |
| diffstat | 3 files changed, 22 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jul 13 22:13:02 2011 +0100 +++ b/ChangeLog Wed Jul 13 22:36:33 2011 +0100 @@ -1,3 +1,13 @@ +2011-07-13 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (bootstrap-directory-stage1): Only use + javah script to ignore -X options if unsupported. + * acinclude.m4: + (IT_JAVAH): Extend to check whether javah supports + -Xbootclasspath and set JAVAH_SUPPORTS_X_OPTIONS if + so. + 2011-07-13 Andrew John Hughes <ahughes@redhat.com> Bump to b147.
--- a/Makefile.am Wed Jul 13 22:13:02 2011 +0100 +++ b/Makefile.am Wed Jul 13 22:36:33 2011 +0100 @@ -1671,7 +1671,11 @@ stamps/bootstrap-directory-stage1.stamp: stamps/native-ecj.stamp mkdir -p $(STAGE1_BOOT_DIR)/bin stamps/ ln -sf $(JAVA) $(STAGE1_BOOT_DIR)/bin/java +if JAVAH_SUPPORTS_X_OPTIONS + ln -sf $(JAVAH) $(STAGE1_BOOT_DIR)/bin/javah +else ln -sf ../../../javah $(STAGE1_BOOT_DIR)/bin/javah +endif ln -sf $(RMIC) $(STAGE1_BOOT_DIR)/bin/rmic ln -sf $(JAR) $(STAGE1_BOOT_DIR)/bin/jar ln -sf $(NATIVE2ASCII) $(STAGE1_BOOT_DIR)/bin/native2ascii
--- a/acinclude.m4 Wed Jul 13 22:13:02 2011 +0100 +++ b/acinclude.m4 Wed Jul 13 22:36:33 2011 +0100 @@ -1269,11 +1269,19 @@ fi fi ]) +AC_CACHE_CHECK([if $JAVAH supports -X options], it_cv_javahx, [ + if $JAVAH -Xbootclasspath:${SYSTEM_JDK_DIR}/jre/lib/rt.jar -classpath . $SUB >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_javahx=yes + else + it_cv_javahx=no + fi +]) rm -f $SUBCLASS $SUPERCLASS $SUBHEADER *.class cd .. rmdir tmp.$$ AM_CONDITIONAL([CP39408_JAVAH], test x"${it_cv_cp39408_javah}" = "xyes") AM_CONDITIONAL([CP40188_JAVAH], test x"${it_cv_cp40188_javah}" = "xyes") +AM_CONDITIONAL([JAVAH_SUPPORTS_X_OPTIONS], test x"${it_cv_javahx}" = "xyes") AC_PROVIDE([$0])dnl ])