diff options
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | Rules.mak | 10 | ||||
| -rw-r--r-- | test/Makefile | 9 |
3 files changed, 16 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index 5d0f87d49..7e4582a0d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -513,7 +513,11 @@ dist release: du -b ../uClibc-$(VERSION).tar.{bz2,xz} test check: test_compile - $(Q)$(MAKE) -C test $(if $(O),top_builddir=$(O)/) + $(Q)$(MAKE) -C test \ + KCONFIG_CONFIG=$(__ABS_KCONFIG_CONFIG) \ + $(if $(O),top_builddir=$(O)/) test_compile: $(LOCAL_INSTALL_PATH) - $(Q)$(MAKE) -C test compile $(if $(O),top_builddir=$(O)/) + $(Q)$(MAKE) -C test compile \ + KCONFIG_CONFIG=$(__ABS_KCONFIG_CONFIG) \ + $(if $(O),top_builddir=$(O)/) @@ -81,14 +81,12 @@ BUILD_CFLAGS = -Os -Wall qstrip = $(strip $(subst ",,$(1))) #")) -ifndef KCONFIG_CONFIG -KCONFIG_CONFIG := $(top_builddir).config -endif +KCONFIG_CONFIG ?= $(top_builddir).config # Pull in the user's uClibc configuration -ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) +ifeq ($(filter $(noconfig_targets) $(clean_targets) CLEAN_%,$(MAKECMDGOALS)),) # Prevent make from searching -__ABS_KCONFIG_CONFIG := $(abspath $(KCONFIG_CONFIG)) +__ABS_KCONFIG_CONFIG ?= $(abspath $(KCONFIG_CONFIG)) -include $(__ABS_KCONFIG_CONFIG) else # else we have to tell config where to write .config @@ -828,8 +826,8 @@ $(eval $(call cache-output-var,LIBGCC,$(CC) $(LIBGCC_CFLAGS) -print-libgcc-file- $(eval $(call cache-output-var,LIBGCC_EH,$(CC) $(LIBGCC_CFLAGS) -print-file-name=libgcc_eh.a)) # with -O0 we (e.g. lockf) might end up with references to # _Unwind_Resume, so pull in gcc_eh in this case.. -LIBGCC += $(if $(DODEBUG),$(LIBGCC_EH)) LIBGCC_DIR:=$(dir $(LIBGCC)) +LIBGCC += $(if $(DODEBUG),$(LIBGCC_EH)) # moved from libpthread/linuxthreads ifeq ($(UCLIBC_CTOR_DTOR),y) diff --git a/test/Makefile b/test/Makefile index 0c7b9151d..a861d4203 100644 --- a/test/Makefile +++ b/test/Makefile @@ -63,13 +63,16 @@ subdirs_run: $(patsubst %, _dirrun_%, $(DIRS)) subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) $(patsubst %, _dir_%, $(DIRS)) : dummy - $(Q)$(MAKE) -C $(patsubst _dir_%, %, $@) + $(Q)$(MAKE) -C $(patsubst _dir_%, %, $@) \ + KCONFIG_CONFIG=$(__ABS_KCONFIG_CONFIG) $(patsubst %, _dirrun_%, $(DIRS)) : dummy - $(Q)$(MAKE) -C $(patsubst _dirrun_%, %, $@) run + $(Q)$(MAKE) -C $(patsubst _dirrun_%, %, $@) run \ + KCONFIG_CONFIG=$(__ABS_KCONFIG_CONFIG) $(patsubst %, _dircompile_%, $(DIRS)) : dummy - $(Q)$(MAKE) -C $(patsubst _dircompile_%, %, $@) compile + $(Q)$(MAKE) -C $(patsubst _dircompile_%, %, $@) compile \ + KCONFIG_CONFIG=$(__ABS_KCONFIG_CONFIG) $(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy $(Q)$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean |