Skip to content

Commit 0c11376

Browse files
authored
Merge pull request #2715 from dotty-staging/fix-windows
Fix compilation under Windows
2 parents e6be996 + 002c64b commit 0c11376

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.jvmopts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-Xss1m
2+
-Xms512m
3+
-Xmx1200m

project/Build.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import sbt._
33
import complete.DefaultParsers._
44
import java.io.{File, RandomAccessFile}
55
import java.nio.channels.FileLock
6-
import java.nio.file.Files
6+
import java.nio.file.{ Files, FileSystemException }
77
import java.util.Calendar
88

99
import scala.reflect.io.Path
@@ -407,7 +407,7 @@ object Build {
407407
Files.createSymbolicLink(/*link = */ dst.toPath, /*existing = */src.toPath)
408408
}
409409
} catch {
410-
case e: UnsupportedOperationException =>
410+
case _: UnsupportedOperationException | _: FileSystemException =>
411411
// If the OS doesn't support symbolic links, copy the directory instead.
412412
sbt.IO.copy(pairs, overwrite = true, preserveLastModified = true)
413413
}

0 commit comments

Comments
 (0)