diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Macros.scala | 12 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/runtime/ReflectionUtils.scala | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Macros.scala b/src/compiler/scala/tools/nsc/typechecker/Macros.scala index 9e8c136ab5..5955081345 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Macros.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Macros.scala @@ -341,11 +341,13 @@ trait Macros extends scala.tools.reflect.FastTrack with Traces { } import SigGenerator._ - macroLogVerbose(s"generating macroImplSigs for: $macroDef") - macroLogVerbose(s"tparams are: $tparams") - macroLogVerbose(s"vparamss are: $vparamss") - macroLogVerbose(s"retTpe is: $retTpe") - macroLogVerbose(s"macroImplSig is: $paramss, $implRetTpe") + macroLogVerbose(sm""" + |generating macroImplSigs for: $macroDef + |tparams are: $tparams + |vparamss are: $vparamss + |retTpe is: $retTpe + |macroImplSig is: $paramss, $implRetTpe + """.trim) (paramss, implRetTpe) } diff --git a/src/reflect/scala/reflect/runtime/ReflectionUtils.scala b/src/reflect/scala/reflect/runtime/ReflectionUtils.scala index 3ee53eb7a1..33ad6d2430 100644 --- a/src/reflect/scala/reflect/runtime/ReflectionUtils.scala +++ b/src/reflect/scala/reflect/runtime/ReflectionUtils.scala @@ -42,7 +42,8 @@ private[scala] object ReflectionUtils { case cl if cl != null && isAbstractFileClassLoader(cl.getClass) => cl.asInstanceOf[{val root: scala.reflect.io.AbstractFile}].root.canonicalPath case null => - scala.util.Properties.propOrEmpty("sun.boot.class.path") + val loadBootCp = (flavor: String) => scala.util.Properties.propOrNone(flavor + ".boot.class.path") + loadBootCp("sun") orElse loadBootCp("java") getOrElse "<unknown>" case _ => "<unknown>" } |