From c8f3025b02258281b08c7cf1a084013224f2450c Mon Sep 17 00:00:00 2001 From: Mikolaj Konarski Date: Wed, 15 Sep 2021 10:49:47 +0200 Subject: [PATCH] Revert "Don't mess with PATH_SEPARATOR outside Windows" This reverts commit b4fbeebcf6fc0811bd780528104d2f4957c583e9. See #7649. --- Cabal/src/Distribution/Simple.hs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Cabal/src/Distribution/Simple.hs b/Cabal/src/Distribution/Simple.hs index fe19558db1a..809038ed3fe 100644 --- a/Cabal/src/Distribution/Simple.hs +++ b/Cabal/src/Distribution/Simple.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE LambdaCase #-} @@ -688,11 +687,7 @@ 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)]