summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2005-12-07 14:46:10 +0000
committermichelou <michelou@epfl.ch>2005-12-07 14:46:10 +0000
commit060f551348fd3d5cf602362be1eb5f404f1c84f1 (patch)
tree060535a81a8dce9418756530102df5f51acf8ce5
parent87052b61f500248b3f7e37da8efa323bedb02189 (diff)
downloadscala-060f551348fd3d5cf602362be1eb5f404f1c84f1.tar.gz
scala-060f551348fd3d5cf602362be1eb5f404f1c84f1.tar.bz2
scala-060f551348fd3d5cf602362be1eb5f404f1c84f1.zip
- removed old Scala jars from TOOLS_CPATH's value
-rw-r--r--build.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index 374b8a2c0e..240d97491e 100644
--- a/build.xml
+++ b/build.xml
@@ -338,7 +338,7 @@
<filterset>
<filter token="VERSION" value="${distrib.version}"/>
<filter token="COPYRIGHT" value="${copyright.notice}"/>
- <filter token="TOOLS_CPATH" value="$PREFIX/lib/fjbg.jar:$PREFIX/lib/msil.jar:$PREFIX/lib/scala.jar:$PREFIX/lib/tools.jar:$PREFIX/lib/${osc-nstools.jar.name}"/>
+ <filter token="TOOLS_CPATH" value="$PREFIX/lib/fjbg.jar:$PREFIX/lib/msil.jar:$PREFIX/lib/${nslib.jar.name}:$PREFIX/lib/${nstools.jar.name}"/>
<filter token="LIB_CPATH" value="$PREFIX/lib/${nslib.jar.name}"/>
<filter token="SCALA" value="${scala.exec.name}"/>
<filter token="SCALAC" value="${scalac.exec.name}"/>
@@ -412,7 +412,7 @@
<filter token="VERSION" value="${distrib.version}"/>
<filter token="COPYRIGHT" value="${copyright.notice}"/>
<filter token="MAIN" value="scala.tools.nsc.Main"/>
- <filter token="TOOLS_CPATH" value="${quotted.lib.dir}\fjbg.jar;${quotted.lib.dir}\msil.jar;${quotted.lib.dir}\scala.jar;${quotted.lib.dir}\tools.jar;${quotted.lib.dir}\${osc-nstools.jar.name}"/>
+ <filter token="TOOLS_CPATH" value="${quotted.lib.dir}\fjbg.jar;${quotted.lib.dir}\msil.jar;${quotted.lib.dir}\${nslib.jar.name};${quotted.lib.dir}\${nstools.jar.name}"/>
<filter token="LIB_CPATH" value="${quotted.lib.dir}\${nslib.jar.name}"/>
</filterset>
</copy>