[commit: ghc] wip/nfs-locking: Drop redundant code (830567e)
git at git.haskell.org
git at git.haskell.org
Fri Oct 27 01:01:12 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/nfs-locking
Link : http://ghc.haskell.org/trac/ghc/changeset/830567e388a89b90a80c0140379c983de3cec8aa/ghc
>---------------------------------------------------------------
commit 830567e388a89b90a80c0140379c983de3cec8aa
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Thu Oct 5 20:08:35 2017 +0100
Drop redundant code
See #314
>---------------------------------------------------------------
830567e388a89b90a80c0140379c983de3cec8aa
src/Environment.hs | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/src/Environment.hs b/src/Environment.hs
index d92e067..de43efa 100644
--- a/src/Environment.hs
+++ b/src/Environment.hs
@@ -2,8 +2,6 @@ module Environment (setupEnvironment) where
import System.Environment
-import Base
-
-- | The build system invokes many external builders whose behaviour is
-- influenced by the environment variables. We need to modify some of them
-- for better robustness of the build system.
@@ -16,13 +14,3 @@ setupEnvironment = do
-- `pwd` will return the Windows path, and then modifying $PATH will fail.
-- See https://github.com/snowleopard/hadrian/issues/189 for details.
unsetEnv "PWD"
-
- -- On Windows, some path variables start a prefix like "C:\\" which may
- -- lead to failures of scripts such as autoreconf. One particular variable
- -- which causes issues is ACLOCAL_PATH. At the moment we simply reset it
- -- if it contains a problematic Windows path.
- -- TODO: Handle Windows paths in ACLOCAL_PATH more gracefully.
- aclocal <- lookupEnv "ACLOCAL_PATH"
- case aclocal of
- Nothing -> return ()
- Just s -> when (":\\" `isPrefixOf` drop 1 s) $ unsetEnv "ACLOCAL_PATH"
More information about the ghc-commits
mailing list