get rid of __WINDOWS__, use mingw32_HOST_OS
The latter is harder for me to remember, but avoids build failures in code used by the configure program.
This commit is contained in:
parent
022c3910e9
commit
93f2371e09
24 changed files with 55 additions and 55 deletions
|
@ -24,7 +24,7 @@ import Utility.Env
|
|||
myHomeDir :: IO FilePath
|
||||
myHomeDir = myVal env homeDirectory
|
||||
where
|
||||
#ifndef __WINDOWS__
|
||||
#ifndef mingw32_HOST_OS
|
||||
env = ["HOME"]
|
||||
#else
|
||||
env = ["USERPROFILE", "HOME"] -- HOME is used in Cygwin
|
||||
|
@ -34,7 +34,7 @@ myHomeDir = myVal env homeDirectory
|
|||
myUserName :: IO String
|
||||
myUserName = myVal env userName
|
||||
where
|
||||
#ifndef __WINDOWS__
|
||||
#ifndef mingw32_HOST_OS
|
||||
env = ["USER", "LOGNAME"]
|
||||
#else
|
||||
env = ["USERNAME", "USER", "LOGNAME"]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue