diff options
| author | ohair <none@none> | 2009-11-11 11:19:10 -0800 |
|---|---|---|
| committer | ohair <none@none> | 2009-11-11 11:19:10 -0800 |
| commit | b7f59433721d0a78585e34753b0425c67f33f7fb (patch) | |
| tree | 4bc7556ac072181908fdebe79e32a9140b7eb130 /make | |
| parent | b9a9c97fee011cc785f1878fcd606b9c304d3c9d (diff) | |
| download | jdk8u_jaxws-b7f59433721d0a78585e34753b0425c67f33f7fb.tar.gz | |
6900341: jaxp/jaxws ant scripts using ant runtime in classpath, needs to be explicit
Reviewed-by: tbell
Diffstat (limited to 'make')
| -rw-r--r-- | make/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/make/Makefile b/make/Makefile index 071a434a..604b35ed 100644 --- a/make/Makefile +++ b/make/Makefile @@ -113,11 +113,13 @@ endif ifdef ALT_LANGTOOLS_DIST ifdef ALT_BOOTDIR ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) + ANT_OPTIONS += -Djdk.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) endif endif @@ -141,7 +143,7 @@ ANT_TARGETS = all source drop_included build dist clobber clean sanity # Create a make target for each $(ANT_TARGETS): - cd .. && $(ANT_JAVA_HOME) $(ANT) -version + cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) -version cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@ # Help target |