Avoid setting LOCPATH in linux standalone builds now that ghc has been fixed to not hang when it cannot find locale files.

This commit is contained in:
Joey Hess 2016-04-20 12:40:11 -04:00
parent b949e85045
commit f947781fa0
Failed to extract signature
4 changed files with 28 additions and 4 deletions

View file

@ -5,6 +5,8 @@
- Licensed under the GNU GPL version 3 or higher.
-}
{-# LANGUAGE CPP #-}
module Main where
import System.Environment
@ -72,6 +74,11 @@ installLinkerShim top linker exe = do
[ "#!/bin/sh"
, "GIT_ANNEX_PROGRAMPATH=\"$0\""
, "export GIT_ANNEX_PROGRAMPATH"
#if ! MIN_VERSION_GLASGOW_HASKELL(7,10,0,0)
-- workaround for https://ghc.haskell.org/trac/ghc/ticket/7695
, "LOCPATH=/dev/null"
, "export LOCPATH"
#endif
, "exec \"$GIT_ANNEX_DIR/" ++ exelink ++ "\" --library-path \"$GIT_ANNEX_LD_LIBRARY_PATH\" \"$GIT_ANNEX_DIR/shimmed/" ++ base ++ "/" ++ base ++ "\" \"$@\""
]
modifyFileMode exe $ addModes executeModes