mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

add back sha commands on OSX; SIGILL problem fixed

Browse source
This commit is contained in:
Joey Hess 2014-01-06 16:11:21 -04:00
parent d356069f3e
commit 22d6019bae
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Build/Configure.hs
View file

@ -1,7 +1,5 @@
{- Checks system configuration and generates SysConfig.hs. -} {- Checks system configuration and generates SysConfig.hs. -}
{-# LANGUAGE CPP #-}
module Build.Configure where module Build.Configure where
import System.Directory import System.Directory
@ -76,13 +74,8 @@ shaTestCases l = map make l
then return $ Just c then return $ Just c
else search cmds else search cmds
#ifndef darwin_HOST_OS
shacmds n = concatMap (\x -> [x, 'g':x]) $ shacmds n = concatMap (\x -> [x, 'g':x]) $
map (\x -> "sha" ++ show n ++ x) ["sum", ""] 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 :: String
tmpDir = "tmp" tmpDir = "tmp"

3
doc/bugs/gsha256sum_crashes.mdwn
View file

@ -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. >> I'm told that other programs, such as wget, also crash with SIGILL.
>> Are there multiple OSX architectures with different instructions sets or >> Are there multiple OSX architectures with different instructions sets or
>> what? --[[Joey]] >> what? --[[Joey]]
>>> Fixed and confirmed fixed now. gsha256sum etc added back to
>>> OSX app. [[done]] --[[Joey]]