diff --git a/make/environment-build.mk b/make/environment-build.mk index 46029560..09a43fd6 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -303,6 +303,7 @@ BUILDENV = \ CPPFLAGS="$(TARGET_CPPFLAGS)" \ CXXFLAGS="$(TARGET_CXXFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ + PKG_CONFIG=$(PKG_CONFIG) \ PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) CONFIGURE_OPTS = \ diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk index b8c3a552..8581c9d6 100644 --- a/make/neutrino-plugins.mk +++ b/make/neutrino-plugins.mk @@ -45,8 +45,6 @@ $(NP_OBJ_DIR)/config.status: $(NP_DEPS) test -d $(NP_OBJ_DIR) || mkdir -p $(NP_OBJ_DIR) $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/autogen.sh pushd $(NP_OBJ_DIR) && \ - export PKG_CONFIG=$(PKG_CONFIG) && \ - export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) && \ $(BUILDENV) \ $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/configure \ --host=$(TARGET) \ diff --git a/make/neutrino.mk b/make/neutrino.mk index 845c2b71..f9dd5300 100644 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -126,7 +126,9 @@ N_BUILDENV = \ CFLAGS="$(N_CFLAGS)" \ CPPFLAGS="$(N_CFLAGS)" \ CXXFLAGS="$(N_CFLAGS) -std=c++11" \ - LDFLAGS="$(N_LDFLAGS)" + LDFLAGS="$(N_LDFLAGS)" \ + PKG_CONFIG=$(PKG_CONFIG) \ + PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) # ----------------------------------------------------------------------------- @@ -136,8 +138,6 @@ $(N_OBJ_DIR)/config.status: $(N_DEPS) git checkout $(NI_NEUTRINO_BRANCH) $(SOURCE_DIR)/$(NI_NEUTRINO)/autogen.sh pushd $(N_OBJ_DIR) && \ - export PKG_CONFIG=$(PKG_CONFIG) && \ - export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) && \ $(N_BUILDENV) \ $(SOURCE_DIR)/$(NI_NEUTRINO)/configure \ --host=$(TARGET) \ @@ -211,8 +211,6 @@ $(LH_OBJ_DIR)/config.status: $(LH_DEPS) test -d $(LH_OBJ_DIR) || mkdir -p $(LH_OBJ_DIR) $(SOURCE_DIR)/$(NI_LIBSTB-HAL)/autogen.sh pushd $(LH_OBJ_DIR) && \ - export PKG_CONFIG=$(PKG_CONFIG) && \ - export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) && \ $(N_BUILDENV) \ $(SOURCE_DIR)/$(NI_LIBSTB-HAL)/configure \ --host=$(TARGET) \