Merge pull request #49 from hkgumbs/fix-pkgcfg-linux

CodaFi · web-flow · commit 2b0eefb416fa · 2017-01-21T18:05:13.000-07:00
Try explicit version number first
diff --git a/utils/make-pkgconfig.swift b/utils/make-pkgconfig.swift
@@ -58,7 +58,7 @@ func makeFile() throws {
   let cllvmPath = pkgConfigDir.appendingPathComponent("cllvm.pc")
 
   /// Ensure we have llvm-config in the PATH
-  guard let llvmConfig = which("llvm-config") else {
+  guard let llvmConfig = which("llvm-config-3.9") ?? which("llvm-config") else {
     throw "Failed to find llvm-config. Ensure llvm-config is installed and " +
           "in your PATH"
   }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func makeFile() throws {`
`58`	`58`	`let cllvmPath = pkgConfigDir.appendingPathComponent("cllvm.pc")`
`59`	`59`
`60`	`60`	`/// Ensure we have llvm-config in the PATH`
`61`		`- guard let llvmConfig = which("llvm-config") else {`
	`61`	`+ guard let llvmConfig = which("llvm-config-3.9") ?? which("llvm-config") else {`
`62`	`62`	`throw "Failed to find llvm-config. Ensure llvm-config is installed and " +`
`63`	`63`	`"in your PATH"`
`64`	`64`	`}`