From b28c614d3729d44378105a4d1cb166dbfda21707 Mon Sep 17 00:00:00 2001 From: Liangbin Lian Date: Fri, 14 Aug 2020 14:19:12 +0800 Subject: [PATCH] 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) --- utils/lvm2/Makefile | 5 +++++ 1 file changed, 5 insertions(+) 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 -- 2.30.2