From ebcb35684a9dfacc986cfc6a63d91f557577c06b Mon Sep 17 00:00:00 2001 From: Mikolaj Konarski Date: Wed, 15 Sep 2021 10:48:25 +0200 Subject: [PATCH 1/3] Revert "Add a changelog entry" This reverts commit 91195e844e44f585298c0cb78806103904c4f9bb. See #7649. (cherry picked from commit 2c6b516ee6f4293d07c4e6f529a848e26d1d26a0) --- changelog.d/pr-7510 | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 changelog.d/pr-7510 diff --git a/changelog.d/pr-7510 b/changelog.d/pr-7510 deleted file mode 100644 index 92d22ed330a..00000000000 --- a/changelog.d/pr-7510 +++ /dev/null @@ -1,4 +0,0 @@ -synopsis: Set PATH_SEPARATOR=";" when calling ./configure on Windows; this fix is necessary for autoconf >= 2.70 -packages: Cabal -prs: #7510 -issues: #7494 From 5ae6ca294502d982ae231d2c8d7cae7b774cecbc Mon Sep 17 00:00:00 2001 From: Mikolaj Konarski Date: Wed, 15 Sep 2021 10:49:47 +0200 Subject: [PATCH 2/3] Revert "Don't mess with PATH_SEPARATOR outside Windows" This reverts commit b4fbeebcf6fc0811bd780528104d2f4957c583e9. See #7649. (cherry picked from commit c8f3025b02258281b08c7cf1a084013224f2450c) --- 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 3b6672a3c8b..c18445e07a2 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 #-} @@ -716,11 +715,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)] From 8fff34097ef6d14d7a40396213cfd29d353dc648 Mon Sep 17 00:00:00 2001 From: Mikolaj Konarski Date: Wed, 15 Sep 2021 10:50:10 +0200 Subject: [PATCH 3/3] Revert "Set PATH_SEPARATOR=; when calling ./configure; fix #7494" This reverts commit 70f411d39ec22c3d02b376bae728ba231b54e385. See #7649. (cherry picked from commit 37ccc45cb7cd6008d69a22b58138deb167edab26) --- Cabal/src/Distribution/Simple.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/Cabal/src/Distribution/Simple.hs b/Cabal/src/Distribution/Simple.hs index c18445e07a2..f58d79f0f23 100644 --- a/Cabal/src/Distribution/Simple.hs +++ b/Cabal/src/Distribution/Simple.hs @@ -715,7 +715,6 @@ runConfigureScript verbosity backwardsCompatHack flags lbi = do pathEnv = maybe (intercalate spSep extraPath) ((intercalate spSep extraPath ++ spSep)++) $ lookup "PATH" env overEnv = ("CFLAGS", Just cflagsEnv) : - ("PATH_SEPARATOR", Just ";") : [("PATH", Just pathEnv) | not (null extraPath)] hp = hostPlatform lbi maybeHostFlag = if hp == buildPlatform then [] else ["--host=" ++ show (pretty hp)]