Mercurial > hg > release > icedtea7-forest-2.5 > jaxws
changeset 861:3a7c902a4390 icedtea-2.5pre06
PR1753: Ant does not respect JAVA_HOME/jdk.home setting
author | andrew |
---|---|
date | Tue, 29 Apr 2014 21:54:42 +0100 |
parents | 9639895f6950 |
children | 411fea5c61c3 |
files | make/Makefile |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Makefile Fri Apr 18 06:40:54 2014 +0100 +++ b/make/Makefile Tue Apr 29 21:54:42 2014 +0100 @@ -101,13 +101,13 @@ ifdef ALT_LANGTOOLS_DIST ifdef ALT_BOOTDIR ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) - ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) + ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) -Djava.home=$(ALT_BOOTDIR) endif ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap else ifdef ALT_JDK_IMPORT_PATH ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH) - ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH) + ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH) -Djava.home=$(ALT_JDK_IMPORT_PATH) endif endif