Set PKG_CONFIG_ALLOW_SYSTEM_(CFLAGS|LIBS) by default

(cherry picked from commit 9f15045) # Conflicts: # Cabal/src/Distribution/Simple/Program/Builtin.hs
haskell · Dec 21, 2023 · 526c985 · 526c985
1 parent 663f35c
commit 526c985
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/Cabal/src/Distribution/Simple/Program/Builtin.hs b/Cabal/src/Distribution/Simple/Program/Builtin.hs
@@ -343,6 +343,20 @@ cppProgram :: Program
 cppProgram = simpleProgram "cpp"
 
 pkgConfigProgram :: Program
+<<<<<<< HEAD
 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'}
+    }
+>>>>>>> 9f1504590 (Set `PKG_CONFIG_ALLOW_SYSTEM_(CFLAGS|LIBS)` by default)
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
+
+}