diff options
| author | Peter Foley <pefoley2@verizon.net> | 2011-10-01 19:47:06 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2011-10-01 19:47:06 -0400 |
| commit | ec3d0b88ab7b8b7bfdfeec93ead2cb52c287c520 (patch) | |
| tree | 9aae125a693c8e2a0dd25611b6355c16468128a7 /solenv | |
| parent | 1a04d9feaebf54b5da21a45483b6e5971d674ad4 (diff) | |
respect PKG_CONFIG_PATH
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/ExternalLib.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk index 07d45b617c05..1e2af7cf1dee 100644 --- a/solenv/gbuild/ExternalLib.mk +++ b/solenv/gbuild/ExternalLib.mk @@ -97,7 +97,7 @@ define gb_ExternalLib__command_autotools mkdir -p $(call gb_ExternalLib_get_builddir,$(1)) && \ tar -x -C $(call gb_ExternalLib_get_builddir,$(1)) --strip-component=1 -f $< && \ pushd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$$p || exit 1; done && \ - CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" PKG_CONFIG_PATH="$(OUTDIR)/lib/pkgconfig" ./configure --prefix=$(OUTDIR) $(T_CONF_ARGS) && \ + CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" PKG_CONFIG_PATH="$(PKG_CONFIG_PATH) $(OUTDIR)/lib/pkgconfig" ./configure --prefix=$(OUTDIR) $(T_CONF_ARGS) && \ for p in $(T_POST_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$p || exit 1; done #we don't want a deployed rpath pointing into our solver, to-do, set correct ORIGIN-foo ? pushd $(call gb_ExternalLib_get_builddir,$(1)) && if test -e libtool ; then sed -i 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec="",g' libtool && sed -i 's,^runpath_var=LD_RUN_PATH,runpath_var=DIE_RPATH_DIE,g' libtool; fi |