From d90f7cea8115bd9e5b5e31c9fd0fe177bc64a7b6 Mon Sep 17 00:00:00 2001
From: Gershom <gershom@mbp.local>
Date: Sat, 26 Sep 2015 01:04:47 -0400
Subject: [PATCH] use searchPathSeparator for cross-plat consistency
---
Cabal/Distribution/Simple.hs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Cabal/Distribution/Simple.hs b/Cabal/Distribution/Simple.hs
index aaf0afdafd..92ea33cc86 100644
--- a/Cabal/Distribution/Simple.hs
+++ b/Cabal/Distribution/Simple.hs
@@ -109,6 +109,7 @@ import System.Environment(getArgs, getProgName)
import System.Directory(removeFile, doesFileExist,
doesDirectoryExist, removeDirectoryRecursive)
import System.Exit (exitWith,ExitCode(..))
+import System.FilePath(searchPathSeparator)
import Distribution.Compat.Environment (getEnvironment)
import Control.Monad (when)
@@ -637,7 +638,8 @@ runConfigureScript verbosity backwardsCompatHack flags lbi = do
-- a way to pass its flags too
let extraPath = fromNubList $ configProgramPathExtra flags
let cflagsEnv = maybe (unwords ccFlags) (++ (" " ++ unwords ccFlags)) $ lookup "CFLAGS" env
- pathEnv = maybe (intercalate ";" extraPath) ((intercalate ";" extraPath ++ ";")++) $ lookup "PATH" env
+ spSep = [searchPathSeparator]
+ pathEnv = maybe (intercalate spSep extraPath) ((intercalate spSep extraPath ++ spSep)++) $ lookup "PATH" env
overEnv = ("CFLAGS", Just cflagsEnv) : [("PATH", Just pathEnv) | not (null extraPath)]
args' = args ++ ["--with-gcc=" ++ ccProg]
shProg = simpleProgram "sh"
--
GitLab