Skip to content

Commit a8d47c3

Browse files
authored
Merge pull request #7510 from Mikolaj/master
Set PATH_SEPARATOR=; when calling ./configure; fix #7494
2 parents bd5e3f4 + 91195e8 commit a8d47c3

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

Cabal/src/Distribution/Simple.hs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE FlexibleContexts #-}
23
{-# LANGUAGE RankNTypes #-}
34
{-# LANGUAGE LambdaCase #-}
@@ -715,6 +716,11 @@ runConfigureScript verbosity backwardsCompatHack flags lbi = do
715716
pathEnv = maybe (intercalate spSep extraPath)
716717
((intercalate spSep extraPath ++ spSep)++) $ lookup "PATH" env
717718
overEnv = ("CFLAGS", Just cflagsEnv) :
719+
-- TODO: Move to either Cabal/src/Distribution/Compat/Environment.hs
720+
-- or Cabal/src/Distribution/Compat/FilePath.hs:
721+
#ifdef mingw32_HOST_OS
722+
("PATH_SEPARATOR", Just ";") :
723+
#endif
718724
[("PATH", Just pathEnv) | not (null extraPath)]
719725
hp = hostPlatform lbi
720726
maybeHostFlag = if hp == buildPlatform then [] else ["--host=" ++ show (pretty hp)]

changelog.d/pr-7510

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
synopsis: Set PATH_SEPARATOR=";" when calling ./configure on Windows; this fix is necessary for autoconf >= 2.70
2+
packages: Cabal
3+
prs: #7510
4+
issues: #7494

0 commit comments

Comments
 (0)