File tree Expand file tree Collapse file tree 2 files changed +22
-0
lines changed
Cabal/src/Distribution/Simple/Program Expand file tree Collapse file tree 2 files changed +22
-0
lines changed Original file line number Diff line number Diff line change @@ -343,6 +343,20 @@ cppProgram :: Program
343
343
cppProgram = simpleProgram " cpp"
344
344
345
345
pkgConfigProgram :: Program
346
+ <<<<<<< HEAD
346
347
pkgConfigProgram = (simpleProgram " pkg-config" ) {
347
348
programFindVersion = findProgramVersion " --version" id
348
349
}
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
+ >>>>>>> 9 f1504590 (Set `PKG_CONFIG_ALLOW_SYSTEM_ (CFLAGS | LIBS )` by default )
Original file line number Diff line number Diff line change
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
+ }
You can’t perform that action at this time.
0 commit comments