Message ID | 20191213162712.6208-1-liuzhengyuan@kylinos.cn (mailing list archive) |
---|---|
State | Mainlined, archived |
Headers | show |
Series | [v2] tools/acpi: fix compilation error | expand |
On Friday, December 13, 2019 5:27:12 PM CET Zhengyuan Liu wrote: > If we compile tools/acpi target in the top source directory, we'd get a > compilation error showing as bellow: > > # make tools/acpi > DESCEND power/acpi > DESCEND tools/acpidbg > CC tools/acpidbg/acpidbg.o > Assembler messages: > Fatal error: can't create /home/lzy/kernel-upstream/power/acpi/\ > tools/acpidbg/acpidbg.o: No such file or directory > ../../Makefile.rules:26: recipe for target '/home/lzy/kernel-upstream/\ > power/acpi/tools/acpidbg/acpidbg.o' failed > make[3]: *** [/home/lzy/kernel-upstream//power/acpi/tools/acpidbg/\ > acpidbg.o] Error 1 > Makefile:19: recipe for target 'acpidbg' failed > make[2]: *** [acpidbg] Error 2 > Makefile:54: recipe for target 'acpi' failed > make[1]: *** [acpi] Error 2 > Makefile:1607: recipe for target 'tools/acpi' failed > make: *** [tools/acpi] Error 2 > > Fixes: d5a4b1a540b ("tools/power/acpi: Remove direct kernel source include reference") > Signed-off-by: Zhengyuan Liu <liuzhengyuan@kylinos.cn> > --- > tools/power/acpi/Makefile.config | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/power/acpi/Makefile.config b/tools/power/acpi/Makefile.config > index 0111d246d1ca..54a2857c2510 100644 > --- a/tools/power/acpi/Makefile.config > +++ b/tools/power/acpi/Makefile.config > @@ -15,7 +15,7 @@ include $(srctree)/../../scripts/Makefile.include > > OUTPUT=$(srctree)/ > ifeq ("$(origin O)", "command line") > - OUTPUT := $(O)/power/acpi/ > + OUTPUT := $(O)/tools/power/acpi/ > endif > #$(info Determined 'OUTPUT' to be $(OUTPUT)) > > Applying as 5.6 material, thanks!
diff --git a/tools/power/acpi/Makefile.config b/tools/power/acpi/Makefile.config index 0111d246d1ca..54a2857c2510 100644 --- a/tools/power/acpi/Makefile.config +++ b/tools/power/acpi/Makefile.config @@ -15,7 +15,7 @@ include $(srctree)/../../scripts/Makefile.include OUTPUT=$(srctree)/ ifeq ("$(origin O)", "command line") - OUTPUT := $(O)/power/acpi/ + OUTPUT := $(O)/tools/power/acpi/ endif #$(info Determined 'OUTPUT' to be $(OUTPUT))
If we compile tools/acpi target in the top source directory, we'd get a compilation error showing as bellow: # make tools/acpi DESCEND power/acpi DESCEND tools/acpidbg CC tools/acpidbg/acpidbg.o Assembler messages: Fatal error: can't create /home/lzy/kernel-upstream/power/acpi/\ tools/acpidbg/acpidbg.o: No such file or directory ../../Makefile.rules:26: recipe for target '/home/lzy/kernel-upstream/\ power/acpi/tools/acpidbg/acpidbg.o' failed make[3]: *** [/home/lzy/kernel-upstream//power/acpi/tools/acpidbg/\ acpidbg.o] Error 1 Makefile:19: recipe for target 'acpidbg' failed make[2]: *** [acpidbg] Error 2 Makefile:54: recipe for target 'acpi' failed make[1]: *** [acpi] Error 2 Makefile:1607: recipe for target 'tools/acpi' failed make: *** [tools/acpi] Error 2 Fixes: d5a4b1a540b ("tools/power/acpi: Remove direct kernel source include reference") Signed-off-by: Zhengyuan Liu <liuzhengyuan@kylinos.cn> --- tools/power/acpi/Makefile.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)