diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-06-01 10:07:06 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-06-01 10:07:06 +0200 |
| commit | 7f090f1551e24bef1ae3493313cfe3cd1cf613dd (patch) | |
| tree | a163598cc6098d2b287518408782577a8c05e9fa | |
| parent | 608387529b790c2a0fc87b4cf5b5324d68d02648 (diff) | |
| parent | 90706b0747dee8e2c35e86bec897a08776a61e6b (diff) | |
| download | scala-7f090f1551e24bef1ae3493313cfe3cd1cf613dd.tar.gz scala-7f090f1551e24bef1ae3493313cfe3cd1cf613dd.tar.bz2 scala-7f090f1551e24bef1ae3493313cfe3cd1cf613dd.zip | |
Merge commit '90706b0' into merge-2.11-to-2.12-june-1
| -rw-r--r-- | src/compiler/scala/tools/ant/Scalac.scala | 2 | ||||
| -rw-r--r-- | test/files/pos/t8449/Client.scala (renamed from test/files/t8449/Client.scala) | 0 | ||||
| -rw-r--r-- | test/files/pos/t8449/Test.java (renamed from test/files/t8449/Test.java) | 0 |
3 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) diff --git a/test/files/t8449/Client.scala b/test/files/pos/t8449/Client.scala index 5d273f06b2..5d273f06b2 100644 --- a/test/files/t8449/Client.scala +++ b/test/files/pos/t8449/Client.scala diff --git a/test/files/t8449/Test.java b/test/files/pos/t8449/Test.java index ecb1711b24..ecb1711b24 100644 --- a/test/files/t8449/Test.java +++ b/test/files/pos/t8449/Test.java |