Skip to content

Commit 9f15045

Browse files
jasagredoMikolaj
authored andcommitted
Set PKG_CONFIG_ALLOW_SYSTEM_(CFLAGS|LIBS) by default
1 parent 3afd3a3 commit 9f15045

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

Cabal/src/Distribution/Simple/Program/Builtin.hs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,4 +400,11 @@ pkgConfigProgram :: Program
400400
pkgConfigProgram =
401401
(simpleProgram "pkg-config")
402402
{ programFindVersion = findProgramVersion "--version" id
403+
, programPostConf = \_ pkgConfProg ->
404+
let programOverrideEnv' =
405+
programOverrideEnv pkgConfProg
406+
++ [ ("PKG_CONFIG_ALLOW_SYSTEM_CFLAGS", Just "1")
407+
, ("PKG_CONFIG_ALLOW_SYSTEM_LIBS", Just "1")
408+
]
409+
in pure $ pkgConfProg{programOverrideEnv = programOverrideEnv'}
403410
}

changelog.d/pkgconfig-envvars

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
synopsis: PkgConfig environment variables
2+
prs: #9134
3+
4+
description: {
5+
6+
- `cabal` invokes `pkg-config` with `PKG_CONFIG_ALLOW_SYSTEM_CFLAGS` and `PKG_CONFIG_ALLOW_SYSTEM_LIBS` set
7+
8+
}

0 commit comments

Comments
 (0)