Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 23:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Give LC_ALL=C to '$LD -v' to get the consistent version output, as commit
bcbcf50f52 ("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: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada 2022-08-28 11:39:55 +09:00
parent a55f283e8b
commit c7b594f53e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/mkcompile_h
View File

@ -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
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}"