From owner-freebsd-x11@FreeBSD.ORG Mon Nov 26 14:40:38 2012 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D0AC3E87 for ; Mon, 26 Nov 2012 14:40:38 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by mx1.freebsd.org (Postfix) with ESMTP id 34BCF8FC13 for ; Mon, 26 Nov 2012 14:40:37 +0000 (UTC) Received: by mail-lb0-f182.google.com with SMTP id go10so8114369lbb.13 for ; Mon, 26 Nov 2012 06:40:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=AcvTFwmPyF5EWqWqPaRfIqCLEnadadf4qSToFmn+6Xo=; b=i/2U3R2GbOHA4BGFSjKwPvAF6LQPdOcQ3wzFy27ZfySkPUPf5N6askbyAJb77FvOPB WFpw/6iV8kFUPh7xULWH7Ly053YrBiHMvohGN6Kdh31eBQH3YA0+oQiksiijsB/YuJjm xxwPsL+7VoZbpcznXqWTCZ2NGk/nhPqFppKps= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:x-gm-message-state; bh=AcvTFwmPyF5EWqWqPaRfIqCLEnadadf4qSToFmn+6Xo=; b=H0X+CnsMFjrDqhBujOvlFWHN4kPf02kuEF+iqBA8OAyCURwWz/dq3jzgcO/n8XZ7yg qFYeLyHJs2pc/7x2eOL7BzOkS3+o01hpzJF78SJ+d+fBTa/sTyBRR4gZiEQaMNF59hmD ValdA3SeMBC9myTA4iIlBphkt/596MYerfaL+WSAyWgB2H5/rhmEyj0ar4MRWjRJc8FY rDHwyS4CKAYsthwQbsjONHcjrH6LfZ2y1zZtOJgv6eeva0J+9WD0RKHg3AgqU82XkfVe bPy3FrRrKUl8uEt62FmVYEtj3iL3fWP5EnX3bYZyzzc8lg/l6hirn1NpfvIzc/W5v//3 LGPQ== Received: by 10.112.38.228 with SMTP id j4mr5197842lbk.87.1353940837128; Mon, 26 Nov 2012 06:40:37 -0800 (PST) MIME-Version: 1.0 Received: by 10.112.154.168 with HTTP; Mon, 26 Nov 2012 06:40:06 -0800 (PST) In-Reply-To: <50B33B4F.9060904@FreeBSD.org> References: <50B33B4F.9060904@FreeBSD.org> From: Eitan Adler Date: Mon, 26 Nov 2012 09:40:06 -0500 Message-ID: Subject: Re: [PATCH] devel/gccmakede: fix build with clang To: Kevin Lo Content-Type: text/plain; charset=UTF-8 X-Gm-Message-State: ALoCoQmGtwgdM990v8Y08qisR2Wn9c4PPe2t6toKfDepF34ciyQiwz1q4WysKJGzks6MMljeBb74 Cc: freebsd-x11@freebsd.org X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Nov 2012 14:40:38 -0000 On 26 November 2012 04:50, Kevin Lo wrote: > Hi, > > Here's the diff to fix build with clang. Ok? > > Index: devel/gccmakedep/Makefile > =================================================================== > --- devel/gccmakedep/Makefile (revision 307767) > +++ devel/gccmakedep/Makefile (working copy) > @@ -18,4 +18,14 @@ MAN1= gccmakedep.1 > > PLIST_FILES= bin/gccmakedep > > -.include > +.include > + > +# clang's cpp destroys whitespace, particularly hard tabs in makefiles, > +# which is fatal for gccmakedep. > +.if ${OSVERSION} >= 1000024 || (${OSVERSION} < 1000024 && ${CC} == "clang") ${CC} == "clang" should be ${CC:T:M*clang*} and the conditional on OSVERSION >= 1000024 should be contingent on ${CC} -- Eitan Adler