simonMar: the recent -odir fix in GHC means the workaround in Cabal has to be...

simonMar: the recent -odir fix in GHC means the workaround in Cabal has to be (selectively) disabled.

Distribution/Simple/Build.hs

@@ -163,7 +163,11 @@ buildGHC pkg_descr lbi verbose = do
 
       -- build any C sources
       unless (null (cSources libBi)) $
-         sequence_ [do let odir = pref `joinFileName` dirOf c
+         sequence_ [do let ghc_vers = compilerVersion (compiler lbi)
+			   odir | versionBranch ghc_vers >= [6,4,1] = pref
+				| otherwise = pref `joinFileName` dirOf c
+				-- ghc 6.4.1 fixed a bug in -odir handling
+				-- for C compilations.
                        createDirectoryIfMissing True odir
 		       let cArgs = ["-I" ++ dir | dir <- includeDirs libBi]
 			       ++ ["-optc" ++ opt | opt <- ccOptions libBi]

Distribution/Version.hs

@@ -99,7 +99,7 @@ import Data.Dynamic	( Typeable(..), TyCon, mkTyCon, mkAppTy )
 import Data.Typeable 	( Typeable )
 #endif
 
-import Data.List	( intersperse )
+import Data.List	( intersperse, sort )
 import Data.Char	( isDigit, isAlphaNum )
 
 {- |
@@ -161,7 +161,7 @@ instance Typeable Version where
 
 instance Eq Version where
   v1 == v2  =  versionBranch v1 == versionBranch v2 
-		&& all (`elem` (versionTags v2)) (versionTags v1)
+                && sort (versionTags v1) == sort (versionTags v2)
 		-- tags may be in any order
 
 instance Ord Version where