From b60cffc90daa55c82d0190965d51588aa7d1edce Mon Sep 17 00:00:00 2001 From: Adam Vogt Date: Thu, 30 Jan 2014 01:47:39 -0500 Subject: rename variables so Prelude.join will not cause problems * background: http://www.haskell.org/haskellwiki/Functor-Applicative-Monad_Proposal#Current_stage:_Prepare_GHC * the change happens in ghc-7.10, and these changes fix warnings with 7.8 --- Config.hs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Config.hs') diff --git a/Config.hs b/Config.hs index a81676f..5145d1a 100644 --- a/Config.hs +++ b/Config.hs @@ -48,20 +48,20 @@ writeTestProg bInfo contents = writeFile (testProgLoc bInfo) contents -- compile, discarding error messages compile cmd = do - let processRecord = (shell $ join cmd) { std_out = CreatePipe + let processRecord = (shell $ unwords cmd) { std_out = CreatePipe , std_err = CreatePipe } ( _, _, _, h) <- createProcess processRecord waitForProcess h -- command to compile the test program compileCmd bInfo buildInfo = [ "gcc " - , (join $ ccOptions buildInfo) - , (join $ cppOptions buildInfo) - , (join $ map ("-I"++) $ includeDirs buildInfo) + , (unwords $ ccOptions buildInfo) + , (unwords $ cppOptions buildInfo) + , (unwords $ map ("-I"++) $ includeDirs buildInfo) , testProgLoc bInfo , "-o" , testOutLoc bInfo - , (join $ map ("-L"++) $ extraLibDirs buildInfo) + , (unwords $ map ("-L"++) $ extraLibDirs buildInfo) ] -- compile a simple program with symbols from GSL and LAPACK with the given libs @@ -72,7 +72,6 @@ testprog bInfo buildInfo libs fmks = do ++ [ (prepend "-l" $ libs) , (prepend "-framework " fmks) ] -join = intercalate " " prepend x = unwords . map (x++) . words check bInfo buildInfo libs fmks = (ExitSuccess ==) `fmap` testprog bInfo buildInfo libs fmks -- cgit v1.2.3