Skip to content

Commit

Permalink
Don't mess with PATH_SEPARATOR outside Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
Mikolaj committed Aug 7, 2021
1 parent 70f411d commit b4fbeeb
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Cabal/src/Distribution/Simple.hs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE LambdaCase #-}
Expand Down Expand Up @@ -715,7 +716,11 @@ 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)]
Expand Down

0 comments on commit b4fbeeb

Please sign in to comment.