add back sha commands on OSX; SIGILL problem fixed
This commit is contained in:
parent
d356069f3e
commit
22d6019bae
2 changed files with 3 additions and 7 deletions
|
@ -1,7 +1,5 @@
|
|||
{- Checks system configuration and generates SysConfig.hs. -}
|
||||
|
||||
{-# LANGUAGE CPP #-}
|
||||
|
||||
module Build.Configure where
|
||||
|
||||
import System.Directory
|
||||
|
@ -76,13 +74,8 @@ shaTestCases l = map make l
|
|||
then return $ Just c
|
||||
else search cmds
|
||||
|
||||
#ifndef darwin_HOST_OS
|
||||
shacmds n = concatMap (\x -> [x, 'g':x]) $
|
||||
map (\x -> "sha" ++ show n ++ x) ["sum", ""]
|
||||
#else
|
||||
-- OSX has had problems with gsha*sum crashing, so do not use.
|
||||
shacmds _ = []
|
||||
#endif
|
||||
|
||||
tmpDir :: String
|
||||
tmpDir = "tmp"
|
||||
|
|
|
@ -87,3 +87,6 @@ I can send you the crash report of hsha256sum if you need it.
|
|||
>> I'm told that other programs, such as wget, also crash with SIGILL.
|
||||
>> Are there multiple OSX architectures with different instructions sets or
|
||||
>> what? --[[Joey]]
|
||||
|
||||
>>> Fixed and confirmed fixed now. gsha256sum etc added back to
|
||||
>>> OSX app. [[done]] --[[Joey]]
|
||||
|
|
Loading…
Reference in a new issue