diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-01-06 16:11:21 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-01-06 16:11:21 -0400 |
| commit | 9cb0e1b810b9582277c39fc7a9bffb58802389bf (patch) | |
| tree | 672061647d2b0a396b3496d9b83e69557b15bb6f | |
| parent | 41d9decf3e7c86740ae3727bc0145da0f4292926 (diff) | |
add back sha commands on OSX; SIGILL problem fixed
| -rw-r--r-- | Build/Configure.hs | 7 | ||||
| -rw-r--r-- | doc/bugs/gsha256sum_crashes.mdwn | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/Build/Configure.hs b/Build/Configure.hs index d255df794..da66aacf2 100644 --- a/Build/Configure.hs +++ b/Build/Configure.hs @@ -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" diff --git a/doc/bugs/gsha256sum_crashes.mdwn b/doc/bugs/gsha256sum_crashes.mdwn index 402462d02..9989b9866 100644 --- a/doc/bugs/gsha256sum_crashes.mdwn +++ b/doc/bugs/gsha256sum_crashes.mdwn @@ -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]] |