diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | include/toplevel.mk | 11 | ||||
| -rw-r--r-- | scripts/config/Makefile | 2 |
3 files changed, 11 insertions, 3 deletions
@@ -18,6 +18,7 @@ $(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the OpenWrt dir world: +DISTRO_PKG_CONFIG:=$(shell which -a pkg-config | grep -E '\/usr' | head -n 1) export PATH:=$(TOPDIR)/staging_dir/host/bin:$(PATH) ifneq ($(OPENWRT_BUILD),1) diff --git a/include/toplevel.mk b/include/toplevel.mk index 36f790f807..e744447b2f 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -99,13 +99,18 @@ prepare-tmpinfo: FORCE $(_SINGLE)$(NO_TRACE_MAKE) menuconfig $(PREP_MK); \ fi +ifneq ($(DISTRO_PKG_CONFIG),) +scripts/config/mconf: export PATH:=$(dir $(DISTRO_PKG_CONFIG)):$(PATH) +endif scripts/config/mconf: @$(_SINGLE)$(SUBMAKE) -s -C scripts/config all CC="$(HOSTCC_WRAPPER)" $(eval $(call rdep,scripts/config,scripts/config/mconf)) scripts/config/qconf: - @$(_SINGLE)$(SUBMAKE) -s -C scripts/config qconf CC="$(HOSTCC_WRAPPER)" + @$(_SINGLE)$(SUBMAKE) -s -C scripts/config qconf \ + CC="$(HOSTCC_WRAPPER)" \ + DISTRO-PKG-CONFIG="$(DISTRO_PKG_CONFIG)" scripts/config/conf: @$(_SINGLE)$(SUBMAKE) -s -C scripts/config conf CC="$(HOSTCC_WRAPPER)" @@ -157,6 +162,10 @@ endif kernel_oldconfig: prepare_kernel_conf $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux oldconfig +ifneq ($(DISTRO_PKG_CONFIG),) +kernel_menuconfig: export PATH:=$(dir $(DISTRO_PKG_CONFIG)):$(PATH) +kernel_nconfig: export PATH:=$(dir $(DISTRO_PKG_CONFIG)):$(PATH) +endif kernel_menuconfig: prepare_kernel_conf $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux menuconfig diff --git a/scripts/config/Makefile b/scripts/config/Makefile index 8bb62d233c..8b78d5a682 100644 --- a/scripts/config/Makefile +++ b/scripts/config/Makefile @@ -20,8 +20,6 @@ check_lxdialog = $(shell $(SHELL) $(CURDIR)/lxdialog/check-lxdialog.sh -$(1)) export CFLAGS += -DKBUILD_NO_NLS -I. $(call check_lxdialog,ccflags) export CXXFLAGS += -DKBUILD_NO_NLS -DISTRO-PKG-CONFIG := $(shell which -a pkg-config | grep -E '\/usr' | head -n 1) - conf-objs := conf.o zconf.tab.o mconf-objs := mconf.o zconf.tab.o qconf-cxxobjs := qconf.o |