projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
On sparc, pass -mcpu=v9 when assembling with object splitting enabled
[ghc-hetmet.git]
/
utils
/
ext-core
/
Setup.lhs
diff --git
a/utils/ext-core/Setup.lhs
b/utils/ext-core/Setup.lhs
index
f7706b8
..
35661d4
100644
(file)
--- a/
utils/ext-core/Setup.lhs
+++ b/
utils/ext-core/Setup.lhs
@@
-1,9
+1,8
@@
#!/usr/bin/env runhaskell
\begin{code}
#!/usr/bin/env runhaskell
\begin{code}
-{-# OPTIONS -Wall #-}
+{-# OPTIONS -Wall -cpp #-}
import Control.Monad
import Control.Monad
-import Data.List
import Distribution.PackageDescription
import Distribution.Simple
import Distribution.Simple.LocalBuildInfo
import Distribution.PackageDescription
import Distribution.Simple
import Distribution.Simple.LocalBuildInfo
@@
-12,13
+11,13
@@
import System.Cmd
import System.FilePath
import System.Exit
import System.Directory
import System.FilePath
import System.Exit
import System.Directory
-import Control.Exception (try)
+import Control.Exception
main :: IO ()
main = do
main :: IO ()
main = do
- let hooks = defaultUserHooks {
+ let hooks = simpleUserHooks {
buildHook = build_primitive_sources
buildHook = build_primitive_sources
- $ buildHook defaultUserHooks
+ $ buildHook simpleUserHooks
}
defaultMainWithHooks hooks
\end{code}
}
defaultMainWithHooks hooks
\end{code}
@@
-58,7
+57,12
@@
maybeUpdateFile source target = do
r <- rawSystem "cmp" ["-s" {-quiet-}, source, target]
case r of
ExitSuccess -> removeFile source
r <- rawSystem "cmp" ["-s" {-quiet-}, source, target]
case r of
ExitSuccess -> removeFile source
- ExitFailure _ -> do try (removeFile target); renameFile source target
-
-
+ ExitFailure _ -> do
+#if __GLASGOW_HASKELL__ >= 610
+ (try :: IO () -> IO (Either IOException ()))
+#else
+ try
+#endif
+ (removeFile target)
+ renameFile source target
\end{code}
\ No newline at end of file
\end{code}
\ No newline at end of file