X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=3e9737fe5bfb325852e9ac99f52a96566417c847;hb=273be06fa7cb1297284dbb553ecc9be7d07df6af;hp=3067063f7bfcdde1be566f7f2841edd674bc684d;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 3067063..3e9737f 100644
--- 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 List		( sort, intersperse )
+import Data.List	( sort, intersperse, nub )
 
 -----------------------------------------------------------------------------
 -- 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
-  let ws = sort way_names
+  let ws = sort (nub way_names)
   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"
+#elif defined(solaris2_TARGET_OS)
+          "-optl-lrt"
 #endif
 	] ),