diff options
| author | Paul Phillips <paulp@improving.org> | 2011-09-10 00:11:26 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-09-10 00:11:26 +0000 |
| commit | 9a40a521b2bed38bd3257e0ad45f9cb1099936ff (patch) | |
| tree | 7973820e0310fc5e0b86bcd57bba5473d7e18891 | |
| parent | bcdd1882f159105db6d748f704839c65491f76d5 (diff) | |
| download | scala-9a40a521b2bed38bd3257e0ad45f9cb1099936ff.tar.gz scala-9a40a521b2bed38bd3257e0ad45f9cb1099936ff.tar.bz2 scala-9a40a521b2bed38bd3257e0ad45f9cb1099936ff.zip | |
Fixing the optimized build.
Continuations suddenly needs fjbg.jar on its classpath due to transitive
dependency, no review.
| -rw-r--r-- | build.xml | 4 | ||||
| -rw-r--r-- | lib/fjbg.jar.desired.sha1 | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -617,7 +617,7 @@ QUICK BUILD (QUICK) <pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-quick.dir}/classes/compiler"/> <pathelement location="${build-quick.dir}/classes/continuations-plugin"/> - <pathelement location="${lib.dir}/forkjoin.jar"/> + <path refid="aux.libs"/> </compilationpath> </scalacfork> <copy @@ -1129,7 +1129,7 @@ BOOTSTRAPPING BUILD (STRAP) <pathelement location="${build-strap.dir}/classes/library"/> <pathelement location="${build-strap.dir}/classes/compiler"/> <pathelement location="${build-strap.dir}/classes/continuations-plugin"/> - <pathelement location="${lib.dir}/forkjoin.jar"/> + <path refid="aux.libs"/> </compilationpath> </scalacfork> <copy diff --git a/lib/fjbg.jar.desired.sha1 b/lib/fjbg.jar.desired.sha1 index 6120c0f6e9..4c84f75d4e 100644 --- a/lib/fjbg.jar.desired.sha1 +++ b/lib/fjbg.jar.desired.sha1 @@ -1 +1 @@ -9638fa48db649c01ea7a0237008c932653e7c19d ?fjbg.jar +4a2407ee675860d7d54824822320553716660a56 ?fjbg.jar |