Mercurial > hg > release > icedtea6-1.13
changeset 2933:6787928de410
Only run -Xshare:dump when java exists and we aren't building CACAO or JamVM.
2012-11-28 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(add-archive): Only run -Xshare:dump when java
exists and we aren't building CACAO or JamVM.
(add-archive-debug): Likewise.
(add-archive-ecj): Likewise.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Wed, 28 Nov 2012 14:41:42 +0000 |
| parents | 62ea56e2d58a |
| children | cea49ba2afcd |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 29 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Nov 28 13:34:53 2012 +0000 +++ b/ChangeLog Wed Nov 28 14:41:42 2012 +0000 @@ -1,3 +1,11 @@ +2012-11-28 Andrew John Hughes <gnu.andrew@redhat.com> + + * Makefile.am: + (add-archive): Only run -Xshare:dump when java + exists and we aren't building CACAO or JamVM. + (add-archive-debug): Likewise. + (add-archive-ecj): Likewise. + 2012-11-28 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4:
--- a/Makefile.am Wed Nov 28 13:34:53 2012 +0000 +++ b/Makefile.am Wed Nov 28 14:41:42 2012 +0000 @@ -1778,14 +1778,26 @@ rm -f stamps/add-tzdata-support-debug.stamp stamps/add-archive.stamp: stamps/icedtea.stamp - $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump +if !ENABLE_JAMVM +if !ENABLE_CACAO + if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \ + fi +endif +endif touch stamps/add-archive.stamp clean-add-archive: rm -f stamps/add-archive.stamp stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump +if !ENABLE_JAMVM +if !ENABLE_CACAO + if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \ + fi +endif +endif touch stamps/add-archive-debug.stamp clean-add-archive-debug: @@ -1937,7 +1949,13 @@ rm -f stamps/add-tzdata-support-ecj.stamp stamps/add-archive-ecj.stamp: stamps/icedtea-ecj.stamp - $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump +if !ENABLE_JAMVM +if !ENABLE_CACAO + if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ + $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \ + fi +endif +endif touch stamps/add-archive-ecj.stamp clean-add-archive-ecj: