From patchwork Tue Apr 15 22:05:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Li X-Patchwork-Id: 3995601 Return-Path: X-Original-To: patchwork-linux-sparse@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C67169F336 for ; Tue, 15 Apr 2014 22:05:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D609F20219 for ; Tue, 15 Apr 2014 22:05:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 981BA20212 for ; Tue, 15 Apr 2014 22:05:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750829AbaDOWF1 (ORCPT ); Tue, 15 Apr 2014 18:05:27 -0400 Received: from mail-qa0-f49.google.com ([209.85.216.49]:46692 "EHLO mail-qa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750790AbaDOWFW (ORCPT ); Tue, 15 Apr 2014 18:05:22 -0400 Received: by mail-qa0-f49.google.com with SMTP id j7so9889887qaq.36 for ; Tue, 15 Apr 2014 15:05:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=pvtWnI+zJ8L9dYlmEp5hVFmQQQVU0Qfib6JOE7kV69o=; b=JWqQZdZ2PIxyjExlNzppIy9BrBPHsxvRhEwESTrzXCjWPN+SMZ3qpF5gtoQseQ1DcO ZT8WEOSroLuuRxWIFxEl4RqDMX1YuIv+RYen1ss1EF2IhT6sl0S2PNuCfw3VrU1XBDkL rK5X54wTshPYlOqfbNtXA0wG/+9oLpTOcYXAp0iYYfVstFzi5/23Xo+0r1DeynxHaAyG Oqlace7slH9LPgL98OquppMjSpcl+a9Zka+X6GlQWVHdWVMB0WG4Pg9PY6tv44oFSs6W YOlzJJJOKJ1wbB/KiOuoV9Bsn7ppXjLsbIZrlpMrsST1do+2NSvez1mfXe0kuIJI26wc qmyw== MIME-Version: 1.0 X-Received: by 10.140.17.81 with SMTP id 75mr5831102qgc.35.1397599521772; Tue, 15 Apr 2014 15:05:21 -0700 (PDT) Received: by 10.140.21.209 with HTTP; Tue, 15 Apr 2014 15:05:21 -0700 (PDT) In-Reply-To: <20140415180045.GA2707@leaf> References: <1397582569-7043-1-git-send-email-cody@linux.vnet.ibm.com> <20140415180045.GA2707@leaf> Date: Tue, 15 Apr 2014 15:05:21 -0700 X-Google-Sender-Auth: gvQ8crzmlKx8HKltPYLev-MGl7E Message-ID: Subject: Re: [PATCH] build: allow use of LLVM_CONFIG to override llvm-config config script From: Christopher Li To: Josh Triplett Cc: Cody P Schafer , Linux-Sparse Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, Apr 15, 2014 at 11:00 AM, Josh Triplett wrote: > On Tue, Apr 15, 2014 at 10:22:49AM -0700, Cody P Schafer wrote: >> On systems like ubuntu 12.04, llvm-config is llvm 2.9, but >> llvm-config-3.0 and llvm-config-3.3 (for example) are versions 3.0 and >> 3.3 respectively. Allow overriding the name/path of the llvm-config >> script so people can use these versioned config scripts >> >> Signed-off-by: Cody P Schafer > > Reviewed-by: Josh Triplett Applied with trivial modification to use simple expanded variable. Chris --- To unsubscribe from this list: send the line "unsubscribe linux-sparse" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/Makefile b/Makefile index bbdc088..f453ded 100644 --- a/Makefile +++ b/Makefile @@ -30,10 +30,10 @@ HAVE_GCC_DEP:=$(shell touch .gcc-test.c && $(CC) -c -Wp,-MD,.gcc-test.d .gcc-test.c 2>/dev/null && \ echo 'yes'; rm -f .gcc-test.d .gcc-test.o .gcc-test.c) HAVE_GTK2:=$(shell pkg-config --exists gtk+-2.0 2>/dev/null && echo 'yes') -LLVM_CONFIG=llvm-config +LLVM_CONFIG:=llvm-config HAVE_LLVM:=$(shell $(LLVM_CONFIG) --version >/dev/null 2>&1 && echo 'yes') HAVE_LLVM_VERSION:=$(shell $(LLVM_CONFIG) --version | grep "^[3-9].*" >/dev/nul -LLVM_VERSION=$(shell $(LLVM_CONFIG) --version) +LLVM_VERSION:=$(shell $(LLVM_CONFIG) --version) GCC_BASE = $(shell $(CC) --print-file-name=) BASIC_CFLAGS = -DGCC_BASE=\"$(GCC_BASE)\"