Fix single test

Author: parsonsmatt

src/Stack/Types/Build.hs

@@ -629,14 +629,36 @@ configureOptsNoDir econfig bco deps isLocal package = concat
                        flagNameString name)
                     (Map.toList flags)
     , map T.unpack $ packageCabalConfigOpts package
-    , concatMap (\x -> [compilerOptionsCabalFlag wc, T.unpack x]) (packageGhcOptions package)
+    , processGhcOptions (packageGhcOptions package)
     , map ("--extra-include-dirs=" ++) (configExtraIncludeDirs config)
     , map ("--extra-lib-dirs=" ++) (configExtraLibDirs config)
     , maybe [] (\customGcc -> ["--with-gcc=" ++ toFilePath customGcc]) (configOverrideGccPath config)
     , ["--exact-configuration"]
     , ["--ghc-option=-fhide-source-paths" | hideSourcePaths cv]
     ]
   where
+    processGhcOptions :: [Text] -> [String]
+    processGhcOptions ("+RTS" : xs) =
+        let
+            (rtsArgs, rest) =
+                takeRtsArgs xs
+        in
+            ("--ghc-options=+RTS " ++ rtsArgs) : processGhcOptions rest
+    processGhcOptions (x : xs) =
+        [compilerOptionsCabalFlag wc, T.unpack x] ++ processGhcOptions xs
+    processGhcOptions [] =
+        []
+    takeRtsArgs :: [Text] -> (String, [Text])
+    takeRtsArgs ("-RTS" : xs) =
+        ("-RTS", xs)
+    takeRtsArgs (x : xs) =
+        let
+            (other, rest) =
+                takeRtsArgs xs
+        in
+            (T.unpack x ++ " " ++ other, rest)
+    takeRtsArgs [] =
+        ([], [])
     wc = view (actualCompilerVersionL.to whichCompiler) econfig
     cv = view (actualCompilerVersionL.to getGhcVersion) econfig
 

test/integration/tests/5180-ghc-rts-flags/Main.hs

@@ -1,4 +1,6 @@
 import StackTest
 
 main :: IO ()
-main = stack ["build"]
+main = do
+    stack ["clean"]
+    stack ["build"]