Merge pull request #7 from ghorn/master

fix getFlagValues in Setup.hs
albertov · Oct 24, 2017 · b33b49c · b33b49c
2 parents aecc2fc + d2cc1db
commit b33b49c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Setup.hs b/Setup.hs
@@ -87,7 +87,11 @@ parseLibraries = concatMap go
                           Nothing     -> []
 
 getFlagValues f s = map (\(_:_:v) -> v) filtered
-  where filtered = filter (\(_:f':_) -> f==f') (words . init $ s)
+  where filtered = filter (\(_:f':_) -> f==f') (words . rstrip $ s)
+        rstrip = reverse . rlstrip . reverse
+        rlstrip ('\n':'\r':x) = x
+        rlstrip ('\n':x) = x
+        rlstrip x = x
 
 staticLibNameAndPath :: FilePath -> Maybe (String, FilePath)
 staticLibNameAndPath p