diff options
author | paltherr <paltherr@epfl.ch> | 2003-08-04 14:51:31 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2003-08-04 14:51:31 +0000 |
commit | ea1bcd09ef787c55a6a7394951d90cc2558e1586 (patch) | |
tree | 78c9a68f4883aeb5e59392f7daa0b07c0e54a9f1 | |
parent | 9b9ce37073ca35212aee2108fba9515882db3379 (diff) | |
download | scala-ea1bcd09ef787c55a6a7394951d90cc2558e1586.tar.gz scala-ea1bcd09ef787c55a6a7394951d90cc2558e1586.tar.bz2 scala-ea1bcd09ef787c55a6a7394951d90cc2558e1586.zip |
- Added support for inlining default bootclassp...
- Added support for inlining default bootclasspath into specified
bootclasspath
-rw-r--r-- | sources/scalac/util/ClassPath.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sources/scalac/util/ClassPath.java b/sources/scalac/util/ClassPath.java index 574121b4cc..75b932a08d 100644 --- a/sources/scalac/util/ClassPath.java +++ b/sources/scalac/util/ClassPath.java @@ -66,6 +66,15 @@ public class ClassPath { public ClassPath(String classpath, String sourcepath, String bootclasspath, String extdirs) { + // replace first empty path in bootclasspath by BOOT_PATH + if (!bootclasspath.equals(BOOT_PATH)) { + String path = PATH_SEP + bootclasspath + PATH_SEP; + int index = path.indexOf(PATH_SEP + PATH_SEP); + if (index >= 0) + bootclasspath = + path.substring(1, index + 1) + BOOT_PATH + + path.substring(index + 1, path.length() - 1); + } String path = ""; path = appendPath(path, bootclasspath); path = appendExtDirs(path, extdirs); |