diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-10 09:19:16 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-10 09:19:16 -0700 |
| commit | 6a5457686a7f1d21159545a87acc898ca98e222e (patch) | |
| tree | 6238b259a90be69eaaff6f870b57e6a12ab52c01 | |
| parent | c7ba756701ece3a9e4b544f364af5362a7821b91 (diff) | |
| parent | dfed2c905829234276d02a5b48e5effdfa9125b2 (diff) | |
| download | scala-6a5457686a7f1d21159545a87acc898ca98e222e.tar.gz scala-6a5457686a7f1d21159545a87acc898ca98e222e.tar.bz2 scala-6a5457686a7f1d21159545a87acc898ca98e222e.zip | |
Merge pull request #860 from jsuereth/fix/critical-build-fixins
Fixed very bad build.xml issue and quick.bin missing ASM.
| -rw-r--r-- | build.xml | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1150,7 +1150,7 @@ QUICK BUILD (QUICK) </javac> <scalacfork destdir="${build-quick.dir}/classes/compiler" - compilerpathref="starr.classpath" + compilerpathref="locker.classpath" params="${scalac.args.all}" srcdir="${src.dir}/msil" jvmargs="${scalacfork.jvmargs}"> @@ -1407,6 +1407,7 @@ QUICK BUILD (QUICK) <path refid="forkjoin.classpath"/> <path refid="fjbg.classpath"/> <path refid="aux.libs"/> + <path refid="asm.classpath"/> <pathelement location="${jline.jar}"/> </path> <taskdef name="quick-bin" classname="scala.tools.ant.ScalaTool" classpathref="quick.bin.classpath"/> |