From 5fdf83a41862c7c1649099b2e23079f247fd0d6c Mon Sep 17 00:00:00 2001 From: Austin English Date: Mon, 14 Aug 2017 13:32:06 -0500 Subject: [PATCH] toolchain-funcs.eclass: fix clang version reporting when clang is not the default compiler Signed-off-by: Austin English --- eclass/toolchain-funcs.eclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index aeb6f7c7029..5c0f19f8cbb 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.eclass @@ -630,9 +630,11 @@ tc-is-clang() { # Internal func. The first argument is the version info to expand. # Query the preprocessor to improve compatibility across different # compilers rather than maintaining a --version flag matrix. #335943 +# FIXME: should this always call gcc expliticly, or should it show the gcc version that clang +# pretends to be if the system compiler is clang _gcc_fullversion() { local ver="$1"; shift - set -- $($(tc-getCPP "$@") -E -P - <<<"__GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__") + set -- $(gcc "$@" -E -P - <<<"__GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__") eval echo "$ver" } @@ -665,7 +667,7 @@ gcc-micro-version() { # Internal func. Based on _gcc_fullversion() above. _clang_fullversion() { local ver="$1"; shift - set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__") + set -- $(clang "$@" -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__") eval echo "$ver" } -- 2.13.0