Mercurial > hg > release > icedtea7-2.4
changeset 2419:68119ec8f861
Revert to copying not linking the HotSpot directory.
2011-05-22 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(replace-hotspot): Revert to copying not
linking; breaks the build in strange ways.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Mon, 23 May 2011 14:08:37 +0100 |
parents | 1af45d3c1f92 |
children | c644df7984ad |
files | ChangeLog Makefile.am |
diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 20 03:23:45 2011 +0100 +++ b/ChangeLog Mon May 23 14:08:37 2011 +0100 @@ -1,3 +1,9 @@ +2011-05-22 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (replace-hotspot): Revert to copying not + linking; breaks the build in strange ways. + 2011-05-20 Andrew John Hughes <ahughes@redhat.com> * acinclude.m4:
--- a/Makefile.am Fri May 20 03:23:45 2011 +0100 +++ b/Makefile.am Mon May 23 14:08:37 2011 +0100 @@ -1244,8 +1244,9 @@ fi ; \ if ! test -d openjdk/hotspot ; \ then \ - ln -s $(abs_top_builddir)/hotspot-$(HS_CHANGESET) \ - openjdk/hotspot ; \ + mv hotspot-$(HS_CHANGESET) openjdk/hotspot ; \ + else \ + rm -rf hotspot-$(HS_CHANGESET) ; \ fi ; \ fi ; \ fi