Set PKG_CONFIG_ALLOW_SYSTEM_(CFLAGS|LIBS) by default

haskell · Sep 18, 2023 · e69b7b8 · e69b7b8
1 parent 470aa2e
commit e69b7b8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/Cabal/src/Distribution/Simple/Program/Builtin.hs b/Cabal/src/Distribution/Simple/Program/Builtin.hs
@@ -400,4 +400,11 @@ pkgConfigProgram :: Program
 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
++
++}