1 files changed, 8 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
index f58223a39e..7acb3632d2 100755
--- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
+++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
@@ -86,10 +86,14 @@ fi
 TOOL_CLASSPATH="@classpath@"
 if [[ -z "$TOOL_CLASSPATH" ]]; then
     for ext in "$SCALA_HOME"/lib/* ; do
-        if [[ -z "$TOOL_CLASSPATH" ]]; then
-            TOOL_CLASSPATH="$ext"
-        else
-            TOOL_CLASSPATH="${TOOL_CLASSPATH}${SEP}${ext}"
+        file_extension="${ext##*.}"
+        # SI-8967 Only consider directories and files named '*.jar'
+        if [[ -d "$ext" || $file_extension == "jar" ]]; then
+          if [[ -z "$TOOL_CLASSPATH" ]]; then
+              TOOL_CLASSPATH="$ext"
+          else
+              TOOL_CLASSPATH="${TOOL_CLASSPATH}${SEP}${ext}"
+          fi
         fi
     done
 fi