Skip to content

Commit 526c985

Browse files
jasagredomergify[bot]
authored andcommitted
Set PKG_CONFIG_ALLOW_SYSTEM_(CFLAGS|LIBS) by default
(cherry picked from commit 9f15045) # Conflicts: # Cabal/src/Distribution/Simple/Program/Builtin.hs
1 parent 663f35c commit 526c985

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,20 @@ cppProgram :: Program
343343
cppProgram = simpleProgram "cpp"
344344

345345
pkgConfigProgram :: Program
346+
<<<<<<< HEAD
346347
pkgConfigProgram = (simpleProgram "pkg-config") {
347348
programFindVersion = findProgramVersion "--version" id
348349
}
350+
=======
351+
pkgConfigProgram =
352+
(simpleProgram "pkg-config")
353+
{ programFindVersion = findProgramVersion "--version" id
354+
, programPostConf = \_ pkgConfProg ->
355+
let programOverrideEnv' =
356+
programOverrideEnv pkgConfProg
357+
++ [ ("PKG_CONFIG_ALLOW_SYSTEM_CFLAGS", Just "1")
358+
, ("PKG_CONFIG_ALLOW_SYSTEM_LIBS", Just "1")
359+
]
360+
in pure $ pkgConfProg{programOverrideEnv = programOverrideEnv'}
361+
}
362+
>>>>>>> 9f1504590 (Set `PKG_CONFIG_ALLOW_SYSTEM_(CFLAGS|LIBS)` by default)

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)