diff options
| author | Bradley Sepos <[email protected]> | 2020-03-24 19:39:43 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2020-03-30 08:39:44 -0400 |
| commit | bf785596ecf7f5b1f4759dbec2561aa912601774 (patch) | |
| tree | e395787899360e7023fcd11730fd3626f00018a6 /make/include | |
| parent | a62d45421f66a93371105ecd36caa7a4292f5cd7 (diff) | |
make: Append system PKG_CONFIG_PATH when building contribs.
Allows specifying custom locations for pkg-config files, and makes the build system generally compatible with packaging systems such as Nix.
Diffstat (limited to 'make/include')
| -rw-r--r-- | make/include/contrib.defs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/make/include/contrib.defs b/make/include/contrib.defs index 0a1c20af8..f249f48f8 100644 --- a/make/include/contrib.defs +++ b/make/include/contrib.defs @@ -125,7 +125,7 @@ define import.CONTRIB.defs endif $(1).CONFIGURE.env.CPPFLAGS = CPPFLAGS="-I$$(call fn.ABSOLUTE,$(CONTRIB.build/))include $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver *D)" $(1).CONFIGURE.env.LDFLAGS = LDFLAGS="-L$$(call fn.ABSOLUTE,$(CONTRIB.build/))lib $$(call fn.ARGS,$(1).GCC,*archs *sysroot *minver ?extra.exe *D)" - $(1).CONFIGURE.env.PKG_CONFIG_PATH = PKG_CONFIG_PATH="$$(call fn.ABSOLUTE,$$(CONTRIB.build/))lib/pkgconfig" + $(1).CONFIGURE.env.PKG_CONFIG_PATH = PKG_CONFIG_PATH="$$(call fn.ABSOLUTE,$$(CONTRIB.build/))lib/pkgconfig:$$(PKG_CONFIG_PATH)" $(1).CONFIGURE.env.args = !CC !CFLAGS !CXX !CXXFLAGS !CPPFLAGS !LD !LDFLAGS !PKG_CONFIG_PATH !LOCAL_PATH !CROSS $(1).CONFIGURE.env = $$(call fn.ARGS,$(1).CONFIGURE.env,$$($(1).CONFIGURE.env.args)) |