Merge pull request #7664 from haskell/mergify/bp/3.6/pr-7651

Revert PR #7510 (which was "Set PATH_SEPARATOR=; when calling ./configure") (backport #7651)
haskell · Sep 19, 2021 · f27710c · f27710c
2 parents 7b7b780 + 8fff340
commit f27710c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/Cabal/src/Distribution/Simple.hs b/Cabal/src/Distribution/Simple.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE LambdaCase #-}
@@ -716,11 +715,6 @@ runConfigureScript verbosity backwardsCompatHack flags lbi = do
       pathEnv = maybe (intercalate spSep extraPath)
                 ((intercalate spSep extraPath ++ spSep)++) $ lookup "PATH" env
       overEnv = ("CFLAGS", Just cflagsEnv) :
--- TODO: Move to either Cabal/src/Distribution/Compat/Environment.hs
--- or Cabal/src/Distribution/Compat/FilePath.hs:
-#ifdef mingw32_HOST_OS
-                ("PATH_SEPARATOR", Just ";") :
-#endif
                 [("PATH", Just pathEnv) | not (null extraPath)]
       hp = hostPlatform lbi
       maybeHostFlag = if hp == buildPlatform then [] else ["--host=" ++ show (pretty hp)]

diff --git a/changelog.d/pr-7510 b/changelog.d/pr-7510