diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-20 12:40:11 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-20 12:40:11 -0400 |
| commit | 52b39f47cee1b905b004b9f0d4eb616b7ce0d3b8 (patch) | |
| tree | c0e0adee03139c9017afece44e4a89a533d6a1b0 /Build | |
| parent | dbfc00e2a6ad99200da35f75f889174cd7bfd195 (diff) | |
Avoid setting LOCPATH in linux standalone builds now that ghc has been fixed to not hang when it cannot find locale files.
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/LinuxMkLibs.hs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Build/LinuxMkLibs.hs b/Build/LinuxMkLibs.hs index 16946e188..0e54672f9 100644 --- a/Build/LinuxMkLibs.hs +++ b/Build/LinuxMkLibs.hs @@ -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 |