Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set PATH_SEPARATOR=; when calling ./configure; fix #7494 (backport #7510) #7568

Merged
merged 3 commits into from
Aug 23, 2021
Merged

Set PATH_SEPARATOR=; when calling ./configure; fix #7494 (backport #7510) #7568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ee8784
Set PATH_SEPARATOR=; when calling ./configure; fix #7494
Mikolaj Aug 5, 2021
afa7cd4
Don't mess with PATH_SEPARATOR outside Windows
Mikolaj Aug 5, 2021
205cab4
Add a changelog entry
Mikolaj Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Cabal/src/Distribution/Simple.hs
View file
Open in desktop
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,6 +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
4 changes: 4 additions & 0 deletions changelog.d/pr-7510
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
synopsis: Set PATH_SEPARATOR=";" when calling ./configure on Windows; this fix is necessary for autoconf >= 2.70
packages: Cabal
prs: #7510
issues: #7494