From 52b39f47cee1b905b004b9f0d4eb616b7ce0d3b8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 20 Apr 2016 12:40:11 -0400 Subject: Avoid setting LOCPATH in linux standalone builds now that ghc has been fixed to not hang when it cannot find locale files. --- Build/LinuxMkLibs.hs | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Build') 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 -- cgit v1.2.3