summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/ant/Scalac.scala
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2016-06-01 10:07:06 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2016-06-01 10:07:06 +0200
commit7f090f1551e24bef1ae3493313cfe3cd1cf613dd (patch)
treea163598cc6098d2b287518408782577a8c05e9fa /src/compiler/scala/tools/ant/Scalac.scala
parent608387529b790c2a0fc87b4cf5b5324d68d02648 (diff)
parent90706b0747dee8e2c35e86bec897a08776a61e6b (diff)
downloadscala-7f090f1551e24bef1ae3493313cfe3cd1cf613dd.tar.gz
scala-7f090f1551e24bef1ae3493313cfe3cd1cf613dd.tar.bz2
scala-7f090f1551e24bef1ae3493313cfe3cd1cf613dd.zip
Merge commit '90706b0' into merge-2.11-to-2.12-june-1
Diffstat (limited to 'src/compiler/scala/tools/ant/Scalac.scala')
-rw-r--r--src/compiler/scala/tools/ant/Scalac.scala2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/ant/Scalac.scala b/src/compiler/scala/tools/ant/Scalac.scala
index 930163af36..e9d1dfe4d2 100644
--- a/src/compiler/scala/tools/ant/Scalac.scala
+++ b/src/compiler/scala/tools/ant/Scalac.scala
@@ -575,8 +575,6 @@ class Scalac extends ScalaMatchingTask with ScalacShared {
settings.classpath.value = asString(getClasspath)
if (!sourcepath.isEmpty)
settings.sourcepath.value = asString(getSourcepath)
- else if (origin.get.size() > 0)
- settings.sourcepath.value = origin.get.list()(0)
if (!bootclasspath.isEmpty)
settings.bootclasspath.value = asString(getBootclasspath)
if (!extdirs.isEmpty) settings.extdirs.value = asString(getExtdirs)