From 22d6019bae5acb0fc55e58ade72f4265a2fa793b Mon Sep 17 00:00:00 2001 From: Joey Hess <joey@kitenet.net> Date: Mon, 6 Jan 2014 16:11:21 -0400 Subject: [PATCH] add back sha commands on OSX; SIGILL problem fixed --- Build/Configure.hs | 7 ------- doc/bugs/gsha256sum_crashes.mdwn | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Build/Configure.hs b/Build/Configure.hs index d255df7949..da66aacf2a 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 402462d027..9989b9866c 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]]