| Message ID | 1537324557-27033-3-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 0c544115379ed77c1843a194e26960e5b8f3d369 |
| Headers | show |
| Series | Fix build with the latest GNU Make | expand |
On Wed, Sep 19, 2018 at 11:35:57AM +0900, Masahiro Yamada wrote: > The escape sequence '\#' does not work for the latest GNU Make from > the git tree. > > Replace it with $(pound) as Linux did. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Applied to u-boot/master, thanks! -- Tom
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index f8c3fff..4dceb6d 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -299,7 +299,7 @@ quiet_cmd_dtc = DTC $@ # Modified for U-Boot # Bring in any U-Boot-specific include at the end of the file cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ - (cat $<; $(if $(u_boot_dtsi),echo '\#include "$(u_boot_dtsi)"')) > $(pre-tmp); \ + (cat $<; $(if $(u_boot_dtsi),echo '$(pound)include "$(u_boot_dtsi)"')) > $(pre-tmp); \ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $(pre-tmp) ; \ $(DTC) -O dtb -o $@ -b 0 \ -i $(dir $<) $(DTC_FLAGS) \
The escape sequence '\#' does not work for the latest GNU Make from the git tree. Replace it with $(pound) as Linux did. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)