projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for warning message (bug #812)
[ghc-hetmet.git]
/
compiler
/
main
/
StaticFlags.hs
diff --git
a/compiler/main/StaticFlags.hs
b/compiler/main/StaticFlags.hs
index
3067063
..
3e9737f
100644
(file)
--- a/
compiler/main/StaticFlags.hs
+++ b/
compiler/main/StaticFlags.hs
@@
-85,7
+85,7
@@
import DATA_IOREF
import UNSAFE_IO ( unsafePerformIO )
import Monad ( when )
import Char ( isDigit )
import UNSAFE_IO ( unsafePerformIO )
import Monad ( when )
import Char ( isDigit )
-import List ( sort, intersperse )
+import Data.List ( sort, intersperse, nub )
-----------------------------------------------------------------------------
-- Static flags
-----------------------------------------------------------------------------
-- Static flags
@@
-458,7
+458,7
@@
allowed_combination way = and [ x `allowedWith` y
findBuildTag :: IO [String] -- new options
findBuildTag = do
way_names <- readIORef v_Ways
findBuildTag :: IO [String] -- new options
findBuildTag = do
way_names <- readIORef v_Ways
- let ws = sort way_names
+ let ws = sort (nub way_names)
if not (allowed_combination ws)
then throwDyn (CmdLineError $
"combination not supported: " ++
if not (allowed_combination ws)
then throwDyn (CmdLineError $
"combination not supported: " ++
@@
-494,6
+494,8
@@
way_details =
#if defined(freebsd_TARGET_OS)
"-optc-pthread"
, "-optl-pthread"
#if defined(freebsd_TARGET_OS)
"-optc-pthread"
, "-optl-pthread"
+#elif defined(solaris2_TARGET_OS)
+ "-optl-lrt"
#endif
] ),
#endif
] ),