From: Liangbin Lian Date: Fri, 14 Aug 2020 06:19:12 +0000 (+0800) Subject: lvm2: fix CE in mac X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F13132%2Fhead;p=feed%2Fpackages.git lvm2: fix CE in mac command-count.h generated by makefile was wrong when using default shell in mac, set shell to bash to fix it. Signed-off-by: Liangbin Lian (cherry picked from commit 9bb0962d6e3a2d5faf28a9624da82a936d961f19) --- diff --git a/utils/lvm2/Makefile b/utils/lvm2/Makefile index d351763f3b..4807396ad3 100644 --- a/utils/lvm2/Makefile +++ b/utils/lvm2/Makefile @@ -59,10 +59,15 @@ CONFIGURE_ARGS += \ --with-default-run-dir=/var/run/lvm \ --with-default-locking-dir=/var/lock/lvm +ifneq ($(shell /bin/sh -c "echo -n 'X'"),X) +MAKE_SHELL = SHELL=/bin/bash +endif + define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(FPIC)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ + $(MAKE_SHELL) \ install endef