Support llvm-config executables named llvm-config-7

llvm-hs/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 7.0.1 (2018-09-29)
+
+* Support llvm-config executables named `llvm-config-7` in addition to
+  `llvm-config-7.0` and `llvm-config`.
+
 ## 7.0.0 (2018-09-28)
 
 * Throw an `EncodeException` if a local variable is defined multiple

llvm-hs/Setup.hs

@@ -43,11 +43,15 @@ lookupFlagAssignment = lookup
 llvmVersion :: Version
 llvmVersion = mkVersion [7,0]
 
+-- Ordered by decreasing specificty so we will prefer llvm-config-7.0
+-- over llvm-config-7 over llvm-config.
 llvmConfigNames :: [String]
-llvmConfigNames = [
-  "llvm-config-" ++ (intercalate "." . map show . versionNumbers $ llvmVersion),
-  "llvm-config"
- ]
+llvmConfigNames = reverse versionedConfigs ++ ["llvm-config"]
+  where
+    versionedConfigs =
+      map
+        (\vs -> "llvm-config-" ++ intercalate "." (map show vs))
+        (tail (inits (versionNumbers llvmVersion)))
 
 findJustBy :: Monad m => (a -> m (Maybe b)) -> [a] -> m (Maybe b)
 findJustBy f (x:xs) = do

llvm-hs/llvm-hs.cabal

@@ -1,5 +1,5 @@
 name: llvm-hs
-version: 7.0.0
+version: 7.0.1
 license: BSD3
 license-file: LICENSE
 author: Anthony Cowley, Stephen Diehl, Moritz Kiefer <[email protected]>, Benjamin S. Scarlet