From patchwork Wed Jul 24 19:13:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11057511 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 25FA91399 for ; Wed, 24 Jul 2019 19:13:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0BF4B285EC for ; Wed, 24 Jul 2019 19:13:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EFFF928931; Wed, 24 Jul 2019 19:13:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9394C285EC for ; Wed, 24 Jul 2019 19:13:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727296AbfGXTNx (ORCPT ); Wed, 24 Jul 2019 15:13:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:57802 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726430AbfGXTNw (ORCPT ); Wed, 24 Jul 2019 15:13:52 -0400 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B80B0218F0; Wed, 24 Jul 2019 19:13:51 +0000 (UTC) Date: Wed, 24 Jul 2019 15:13:49 -0400 From: Steven Rostedt To: Linux Trace Devel Cc: howaboutsynergy@pm.me, Patrick McLean Subject: trace-cmd: Only add udis86 CFLAGS and LDFLAGS if it is found Message-ID: <20190724151349.405d146b@gandalf.local.home> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP [ Patrick, I don't have udis86 on my machines, can you test to see if this will include it if you do not set NO_UDIS86? ] As we need to update both LDFLAGS and CFLAGS, move the test to see if udisc86 is installed to a variable, and then set NO_UDIS86 if it is not found. This way we do not need to test if it exists twice, nor have LDFLAGS set unconditionally. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204277 Reported-by: howaboutsynergy@pm.me Signed-off-by: Steven Rostedt (VMware) diff --git a/Makefile b/Makefile index 0aa98517..e98535ea 100644 --- a/Makefile +++ b/Makefile @@ -136,9 +136,14 @@ export NO_PYTHON test-build = $(if $(shell sh -c 'echo "$(1)" | \ $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y'), $2) +UDIS86_AVAILABLE := $(call test-build,\#include , y) +ifneq ($(UDIS86_AVAILABLE), y) +NO_UDIS86 := 1 +endif + ifndef NO_UDIS86 # have udis86 disassembler library? -udis86-flags := $(call test-build,\#include ,-DHAVE_UDIS86 -ludis86) +udis86-flags := -DHAVE_UDIS86 -ludis86 udis86-ldflags := -ludis86 endif # NO_UDIS86