提交 25eaf00d 编写于 作者: G Georgi Valkov 提交者: Zheng Zengkai

libbpf: Fix INSTALL flag order

stable inclusion
from stable-5.10.27
commit 9857de932b30e794fbf63f0a0175643468ff9a15
bugzilla: 51493

--------------------------------

[ Upstream commit e7fb6465 ]

It was reported ([0]) that having optional -m flag between source and
destination arguments in install command breaks bpftools cross-build
on MacOS. Move -m to the front to fix this issue.

  [0] https://github.com/openwrt/openwrt/pull/3959

Fixes: 7110d80d ("libbpf: Makefile set specified permission mode")
Signed-off-by: NGeorgi Valkov <gvalkov@abv.bg>
Signed-off-by: NAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20210308183038.613432-1-andrii@kernel.orgSigned-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: N  Weilong Chen <chenweilong@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 28800cb2
...@@ -236,7 +236,7 @@ define do_install ...@@ -236,7 +236,7 @@ define do_install
if [ ! -d '$(DESTDIR_SQ)$2' ]; then \ if [ ! -d '$(DESTDIR_SQ)$2' ]; then \
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \
fi; \ fi; \
$(INSTALL) $1 $(if $3,-m $3,) '$(DESTDIR_SQ)$2' $(INSTALL) $(if $3,-m $3,) $1 '$(DESTDIR_SQ)$2'
endef endef
install_lib: all_cmd install_lib: all_cmd
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册