X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FSysTools.lhs;h=6f73313d09a2bf3c1ba179cd491544d9d860d06a;hb=d2fcb5a672c1670ed06910e90bcfbab344aa5c27;hp=d8eb0fe1995b52936bc536605aee3e48d4a52faf;hpb=16e4ce4c0c02650082f2e11982017c903c549ad5;p=ghc-hetmet.git diff --git a/ghc/compiler/main/SysTools.lhs b/ghc/compiler/main/SysTools.lhs index d8eb0fe..6f73313 100644 --- a/ghc/compiler/main/SysTools.lhs +++ b/ghc/compiler/main/SysTools.lhs @@ -623,9 +623,11 @@ setTmpDir dir = writeIORef v_TmpDir (canonicalise dir) #if !defined(mingw32_HOST_OS) canonicalise p = normalisePath p #else - -- canonicalisation of temp path under win32 is a bit more - -- involved: strip trailing slash, deal with /cygdrive-paths, - -- normalise slashes. + -- Canonicalisation of temp path under win32 is a bit more + -- involved: (a) strip trailing slash, + -- (b) normalise slashes + -- (c) just in case, if there is a prefix /cygdrive/x/, change to x: + -- canonicalise path = normalisePath (xltCygdrive (removeTrailingSlash path)) -- if we're operating under cygwin, and TMP/TEMP is of