Fix the combination of --enable-library-profiling and --enable-split-…

…objs
gentoo-haskell · Sep 26, 2006 · 5799513 · 5799513
1 parent 2e4d608
commit 5799513
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Distribution/Simple/GHC.hs b/Distribution/Simple/GHC.hs
@@ -301,17 +301,18 @@ build pkg_descr lbi verbose = do
 -- Module_split directory for each module.
 getHaskellObjects :: PackageDescription -> BuildInfo -> LocalBuildInfo
  	-> FilePath -> String -> IO [FilePath]
-getHaskellObjects pkg_descr libBi lbi pref obj_ext
+getHaskellObjects pkg_descr libBi lbi pref wanted_obj_ext
   | splitObjs lbi = do
 	let dirs = [ pref `joinFileName` (dotToSep x ++ "_split") 
 		   | x <- libModules pkg_descr ]
 	objss <- mapM getDirectoryContents dirs
 	let objs = [ dir `joinFileName` obj
 		   | (objs,dir) <- zip objss dirs, obj <- objs,
-		     obj_ext `isSuffixOf` obj ]
+                     let (_,obj_ext) = splitFileExt obj,
+		     wanted_obj_ext == obj_ext ]
 	return objs
   | otherwise  = 
-	return [ pref `joinFileName` (dotToSep x) `joinFileExt` obj_ext
+	return [ pref `joinFileName` (dotToSep x) `joinFileExt` wanted_obj_ext
                | x <- libModules pkg_descr ]