Skip to content

Commit 6e85be2

Browse files
authored
Merge pull request #27865 from ocaml/fix-conf-mariadb-pkgconf
small fix for conf-mariadb.2
2 parents 656ad26 + 0af3387 commit 6e85be2

File tree

1 file changed

+2
-1
lines changed
  • packages/conf-mariadb/conf-mariadb.2

1 file changed

+2
-1
lines changed

packages/conf-mariadb/conf-mariadb.2/opam

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ bug-reports: "https://jira.mariadb.org/projects/MDEV/issues"
66
dev-repo: "git+https://github.com/MariaDB/server.git"
77
license: "GPL-2.0-only"
88
build: [
9-
["sh" "-exc" "pkg-config --exists libmariadb || pkg-config --exists mariadb"] # libmariadb is a newer library name
9+
["sh" "-exc" "pkg-config --exists libmariadb || pkg-config --exists mariadb"] { os != "win32" } # libmariadb is a newer library name
10+
["pkgconf" "--exists" "libmariadb"] { os = "win32" & os-distribution != "msys2" }
1011
]
1112
depends: [
1213
"conf-pkg-config" {build}

0 commit comments

Comments
 (0)