diff options
| author | Stefan Bodewig <bodewig@apache.org> | 2001-01-16 16:30:03 +0000 |
|---|---|---|
| committer | Stefan Bodewig <bodewig@apache.org> | 2001-01-16 16:30:03 +0000 |
| commit | 05d67d513e32571036c6713a25c283a98b7fef87 (patch) | |
| tree | 59fac45ac34bf5e6749bb0bef8e937c3950050c6 /bootstrap.sh | |
| parent | 28d98d0882f5302bceb901250db0b5a87c73d49c (diff) | |
| download | ant-05d67d513e32571036c6713a25c283a98b7fef87.tar.gz | |
Make sure we are invoking the correct javac, remove old optional.jar
as well.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268466 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'bootstrap.sh')
| -rwxr-xr-x | bootstrap.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 3ae87a84f..db013da12 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -32,7 +32,7 @@ ANT_HOME=. export ANT_HOME if [ -z "$JAVAC" ] ; then - JAVAC=javac; + JAVAC=${JAVA_HOME}/bin/javac; fi echo ... Bootstrapping Ant Distribution @@ -40,6 +40,9 @@ echo ... Bootstrapping Ant Distribution if [ -f "lib/ant.jar" ] ; then rm lib/ant.jar fi +if [ -f "lib/otional.jar" ] ; then + rm lib/optional.jar +fi # add in the dependency .jar files DIRLIBS=${ANT_HOME}/lib/*.jar |