diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-26 14:43:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-26 14:43:42 -0700 |
| commit | 0e536e2516296c93a45933f540de587b4597681a (patch) | |
| tree | 988a08b470ca4d769ae6ae3417af6c1efea3b709 | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux (diff) | |
| parent | selftests: Fix build failures when invoked from kselftest target (diff) | |
| download | linux-dev-0e536e2516296c93a45933f540de587b4597681a.tar.xz linux-dev-0e536e2516296c93a45933f540de587b4597681a.zip | |
Merge tag 'linux-kselftest-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest fix from Shuah Khan.
* tag 'linux-kselftest-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
selftests: Fix build failures when invoked from kselftest target
| -rw-r--r-- | tools/testing/selftests/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 4e511221a0c1..0db571340edb 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -22,6 +22,14 @@ TARGETS += vm TARGETS_HOTPLUG = cpu-hotplug TARGETS_HOTPLUG += memory-hotplug +# Clear LDFLAGS and MAKEFLAGS if called from main +# Makefile to avoid test build failures when test +# Makefile doesn't have explicit build rules. +ifeq (1,$(MAKELEVEL)) +undefine LDFLAGS +override MAKEFLAGS = +endif + all: for TARGET in $(TARGETS); do \ make -C $$TARGET; \ |