[tip: objtool/core] objtool: Hide unnecessary compiler error message

From: tip-bot2 for David Engraf
Date: Fri Mar 14 2025 - 16:12:20 EST


The following commit has been merged into the objtool/core branch of tip:

Commit-ID: bf71940fc16953bed84caa59b7b076ead70d42f6
Gitweb: https://git.kernel.org/tip/bf71940fc16953bed84caa59b7b076ead70d42f6
Author: David Engraf <david.engraf@xxxxxxxxx>
AuthorDate: Mon, 03 Feb 2025 08:36:10 +01:00
Committer: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
CommitterDate: Wed, 12 Mar 2025 15:43:38 -07:00

objtool: Hide unnecessary compiler error message

The check for using old libelf prints an error message when libelf.h is
not available but does not abort. This may confuse so hide the compiler
error message.

Signed-off-by: David Engraf <david.engraf@xxxxxxxxx>
Link: https://lore.kernel.org/r/20250203073610.206000-1-david.engraf@xxxxxxxxx
Signed-off-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
---
tools/objtool/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
index 7a65948..8c20361 100644
--- a/tools/objtool/Makefile
+++ b/tools/objtool/Makefile
@@ -37,7 +37,7 @@ OBJTOOL_CFLAGS := -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBE
OBJTOOL_LDFLAGS := $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)

# Allow old libelf to be used:
-elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(HOSTCC) $(OBJTOOL_CFLAGS) -x c -E - | grep elf_getshdr)
+elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(HOSTCC) $(OBJTOOL_CFLAGS) -x c -E - 2>/dev/null | grep elf_getshdr)
OBJTOOL_CFLAGS += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED)

# Always want host compilation.