提交 c7b594f5 编写于 作者: M Masahiro Yamada

scripts/mkcompile_h: move LC_ALL=C to '$LD -v'

Minimize the scope of LC_ALL=C like before commit 87c94bfb ("kbuild:
override build timestamp & version").

Give LC_ALL=C to '$LD -v' to get the consistent version output, as commit
bcbcf50f ("kbuild: fix ld-version.sh to not be affected by locale")
mentioned the LD version is affected by locale.

While I was here, I merged two sed invocations.
Signed-off-by: NMasahiro Yamada <masahiroy@kernel.org>
上级 a55f283e
...@@ -8,10 +8,6 @@ LD=$3 ...@@ -8,10 +8,6 @@ LD=$3
# Do not expand names # Do not expand names
set -f set -f
# Fix the language to get consistent output
LC_ALL=C
export LC_ALL
if test -z "$KBUILD_BUILD_USER"; then if test -z "$KBUILD_BUILD_USER"; then
LINUX_COMPILE_BY=$(whoami | sed 's/\\/\\\\/') LINUX_COMPILE_BY=$(whoami | sed 's/\\/\\\\/')
else else
...@@ -23,8 +19,8 @@ else ...@@ -23,8 +19,8 @@ else
LINUX_COMPILE_HOST=$KBUILD_BUILD_HOST LINUX_COMPILE_HOST=$KBUILD_BUILD_HOST
fi fi
LD_VERSION=$($LD -v | head -n1 | sed 's/(compatible with [^)]*)//' \ LD_VERSION=$(LC_ALL=C $LD -v | head -n1 |
| sed 's/[[:space:]]*$//') sed -e 's/(compatible with [^)]*)//' -e 's/[[:space:]]*$//')
cat <<EOF cat <<EOF
#define UTS_MACHINE "${UTS_MACHINE}" #define UTS_MACHINE "${UTS_MACHINE}"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册