Merge pull request #9550 from haskell/mergify/bp/3.10/pr-9134

Try each pkg-config query separatedly (backport #9134)
haskell · Dec 22, 2023 · d09cd57 · d09cd57
2 parents 5fefcf5 + 8af26e3
commit d09cd57
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/Cabal/src/Distribution/Simple/Program/Builtin.hs b/Cabal/src/Distribution/Simple/Program/Builtin.hs
@@ -343,6 +343,14 @@ cppProgram :: Program
 cppProgram = simpleProgram "cpp"
 
 pkgConfigProgram :: Program
-pkgConfigProgram = (simpleProgram "pkg-config") {
-    programFindVersion = findProgramVersion "--version" id
-  }
+pkgConfigProgram =
+  (simpleProgram "pkg-config")
+    { programFindVersion = findProgramVersion "--version" id
+    , programPostConf = \_ pkgConfProg ->
+        let programOverrideEnv' =
+              programOverrideEnv pkgConfProg
+                ++ [ ("PKG_CONFIG_ALLOW_SYSTEM_CFLAGS", Just "1")
+                   , ("PKG_CONFIG_ALLOW_SYSTEM_LIBS", Just "1")
+                   ]
+         in pure $ pkgConfProg{programOverrideEnv = programOverrideEnv'}
+    }
diff --git a/changelog.d/pkgconfig-envvars b/changelog.d/pkgconfig-envvars
@@ -0,0 +1,8 @@
+synopsis: PkgConfig environment variables
+prs: #9134
+
+description: {
+
+- `cabal` invokes `pkg-config` with `PKG_CONFIG_ALLOW_SYSTEM_CFLAGS` and `PKG_CONFIG_ALLOW_SYSTEM_LIBS` set
+
+}