| From 0fbb51faf1edb9f6e3741a97ebd3939404ee1b98 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 14 Jan 2020 11:10:51 +0530 |
| Subject: tools/test/nvdimm: Fix out of tree build |
| |
| From: Santosh Sivaraj <santosh@fossix.org> |
| |
| [ Upstream commit 1f776799628139d0da47e710ad86eb58d987ff66 ] |
| |
| Out of tree build using |
| |
| make M=tools/test/nvdimm O=/tmp/build -C /tmp/build |
| |
| fails with the following error |
| |
| make: Entering directory '/tmp/build' |
| CC [M] tools/testing/nvdimm/test/nfit.o |
| linux/tools/testing/nvdimm/test/nfit.c:19:10: fatal error: nd-core.h: No such file or directory |
| 19 | #include <nd-core.h> |
| | ^~~~~~~~~~~ |
| compilation terminated. |
| |
| That is because the kbuild file uses $(src) which points to |
| tools/testing/nvdimm, $(srctree) correctly points to root of the linux |
| source tree. |
| |
| Reported-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> |
| Signed-off-by: Santosh Sivaraj <santosh@fossix.org> |
| Link: https://lore.kernel.org/r/20200114054051.4115790-1-santosh@fossix.org |
| Signed-off-by: Dan Williams <dan.j.williams@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/testing/nvdimm/Kbuild | 4 ++-- |
| tools/testing/nvdimm/test/Kbuild | 4 ++-- |
| 2 files changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/tools/testing/nvdimm/Kbuild b/tools/testing/nvdimm/Kbuild |
| index dbebf05f59313..47f9cc9dcd94b 100644 |
| --- a/tools/testing/nvdimm/Kbuild |
| +++ b/tools/testing/nvdimm/Kbuild |
| @@ -21,8 +21,8 @@ DRIVERS := ../../../drivers |
| NVDIMM_SRC := $(DRIVERS)/nvdimm |
| ACPI_SRC := $(DRIVERS)/acpi/nfit |
| DAX_SRC := $(DRIVERS)/dax |
| -ccflags-y := -I$(src)/$(NVDIMM_SRC)/ |
| -ccflags-y += -I$(src)/$(ACPI_SRC)/ |
| +ccflags-y := -I$(srctree)/drivers/nvdimm/ |
| +ccflags-y += -I$(srctree)/drivers/acpi/nfit/ |
| |
| obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o |
| obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o |
| diff --git a/tools/testing/nvdimm/test/Kbuild b/tools/testing/nvdimm/test/Kbuild |
| index fb3c3d7cdb9bd..75baebf8f4ba1 100644 |
| --- a/tools/testing/nvdimm/test/Kbuild |
| +++ b/tools/testing/nvdimm/test/Kbuild |
| @@ -1,6 +1,6 @@ |
| # SPDX-License-Identifier: GPL-2.0 |
| -ccflags-y := -I$(src)/../../../../drivers/nvdimm/ |
| -ccflags-y += -I$(src)/../../../../drivers/acpi/nfit/ |
| +ccflags-y := -I$(srctree)/drivers/nvdimm/ |
| +ccflags-y += -I$(srctree)/drivers/acpi/nfit/ |
| |
| obj-m += nfit_test.o |
| obj-m += nfit_test_iomap.o |
| -- |
| 2.20.1 |
| |