diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-12-13 09:33:12 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-12-13 12:05:41 -0800 |
| commit | f0bc3f765416b2ff89ebb5af5677ba08010306d3 (patch) | |
| tree | 5c1e339f11f88fab0e258c031c8bc78f0593b0ac | |
| parent | 61862d2454d9960242dad7df523177755b0fd0d5 (diff) | |
| download | scala-f0bc3f765416b2ff89ebb5af5677ba08010306d3.tar.gz scala-f0bc3f765416b2ff89ebb5af5677ba08010306d3.tar.bz2 scala-f0bc3f765416b2ff89ebb5af5677ba08010306d3.zip | |
use consistent scalac args in quick&strap
| -rw-r--r-- | build.xml | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -286,10 +286,9 @@ INITIALISATION <property name="scalac.args.optimise" value=""/> <!-- scalac.args.quickonly are added to quick.* targets but not others (particularly, locker.) This is to facilitate testing new command line options which do not yet exist in starr. --> - <property name="scalac.args.quickonly" value=""/> + <property name="scalac.args.quickonly" value="-Ydependent-method-types"/> <property name="scalac.args.all" value="${scalac.args} ${scalac.args.optimise}"/> - <property name="scalac.args.quick" value="${scalac.args.all} ${scalac.args.quickonly}"/> - <property name="scalac.args.strap.lib" value="${scalac.args.all} -Ydependent-method-types"/> + <property name="scalac.args.quick" value="${scalac.args.all} ${scalac.args.quickonly}"/> <!-- Setting-up Ant contrib tasks --> <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib.dir}/ant/ant-contrib.jar"/> <!-- This is the start time for the distribution --> @@ -576,7 +575,7 @@ QUICK BUILD (QUICK) destdir="${build-quick.dir}/classes/library" compilerpathref="locker.classpath" srcpath="${src.dir}/library" - params="${scalac.args.quick} -Ydependent-method-types" + params="${scalac.args.quick}" srcdir="${src.dir}/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -1113,7 +1112,7 @@ BOOTSTRAPPING BUILD (STRAP) destdir="${build-strap.dir}/classes/library" compilerpathref="pack.classpath" srcpath="${src.dir}/library" - params="${scalac.args.strap.lib}" + params="${scalac.args.quick}" srcdir="${src.dir}/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -1122,7 +1121,7 @@ BOOTSTRAPPING BUILD (STRAP) <scalacfork destdir="${build-strap.dir}/classes/library" compilerpathref="pack.classpath" - params="${scalac.args.all}" + params="${scalac.args.quick}" srcdir="${src.dir}/actors" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -1131,7 +1130,7 @@ BOOTSTRAPPING BUILD (STRAP) <scalacfork destdir="${build-strap.dir}/classes/library" compilerpathref="pack.classpath" - params="${scalac.args.all}" + params="${scalac.args.quick}" srcdir="${src.dir}/dbc" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -1140,7 +1139,7 @@ BOOTSTRAPPING BUILD (STRAP) <scalacfork destdir="${build-strap.dir}/classes/library" compilerpathref="pack.classpath" - params="${scalac.args.all}" + params="${scalac.args.quick}" srcdir="${src.dir}/swing" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -1176,7 +1175,7 @@ BOOTSTRAPPING BUILD (STRAP) <scalacfork destdir="${build-strap.dir}/classes/compiler" compilerpathref="pack.classpath" - params="${scalac.args.all}" + params="${scalac.args.quick}" srcdir="${src.dir}/compiler" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> |