Messages in this thread Patch in this message | | | From | Yuxuan Shui <> | Subject | [PATCH] kbuild: compile_h: fix compiler version detection with clang | Date | Thu, 14 May 2020 23:19:05 +0100 |
| |
In some setup clang will print a line about CUDA version it detects, like this:
Found CUDA installation: /opt/cuda, version 10.1
So grepping ' version ' matches 2 lines, and results in a broken string in compiler.h, which doesn't compile.
This commit adds a "head -n1" to fix this problem.
Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com> --- scripts/mkcompile_h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h index 5b80a4699740..8e6b4fc6fdd9 100755 --- a/scripts/mkcompile_h +++ b/scripts/mkcompile_h @@ -62,7 +62,7 @@ UTS_VERSION="$(echo $UTS_VERSION $CONFIG_FLAGS $TIMESTAMP | cut -b -$UTS_LEN)" printf '#define LINUX_COMPILE_BY "%s"\n' "$LINUX_COMPILE_BY" echo \#define LINUX_COMPILE_HOST \"$LINUX_COMPILE_HOST\"
- CC_VERSION=$($CC -v 2>&1 | grep ' version ' | sed 's/[[:space:]]*$//') + CC_VERSION=$($CC -v 2>&1 | grep ' version ' | head -n1 | sed 's/[[:space:]]*$//') LD_VERSION=$($LD -v | head -n1 | sed 's/(compatible with [^)]*)//' \ | sed 's/[[:space:]]*$//') printf '#define LINUX_COMPILER "%s"\n' "$CC_VERSION, $LD_VERSION" -- 2.26.2[unhandled content-type:application/pgp-signature]
| |