Date: Sat, 3 Aug 2013 22:34:21 +0200 From: Emanuel Haupt <ehaupt@FreeBSD.org> To: Chris Rees <crees@FreeBSD.org> Cc: "svn-ports-head@freebsd.org" <svn-ports-head@FreeBSD.org>, svn-ports-all@FreeBSD.org, "ports-committers@freebsd.org" <ports-committers@FreeBSD.org> Subject: Re: svn commit: r319300 - head/net/socat Message-ID: <20130803223421.3ab76cbd67172446cde8c208@FreeBSD.org> In-Reply-To: <CADLo839f-JZYTrPoJntE_6joB6bGG8-P_AOnp3uBGJ2SE-BMnA@mail.gmail.com> References: <201305280927.r4S9RKWE003856@svn.freebsd.org> <CADLo839f-JZYTrPoJntE_6joB6bGG8-P_AOnp3uBGJ2SE-BMnA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Chris Rees <crees@FreeBSD.org> wrote: > On 28 May 2013 10:27, Emanuel Haupt <ehaupt@freebsd.org> wrote: > > Author: ehaupt > > Date: Tue May 28 09:27:19 2013 > > New Revision: 319300 > > URL: http://svnweb.freebsd.org/changeset/ports/319300 > > > > Log: > > Rework previous commit. The problem is not clang 3.3 but rather > > the fact that with 1000024 CC became 'cc' rather than 'clang'. > > > > Modified: > > head/net/socat/Makefile > > > > Modified: head/net/socat/Makefile > > ============================================================================== > > --- head/net/socat/Makefile Tue May 28 09:12:07 2013 > > (r319299) +++ head/net/socat/Makefile Tue May 28 09:27:19 > > 2013 (r319300) @@ -28,16 +28,11 @@ OPTIONS_DEFINE= DOCS > > > > .include <bsd.port.options.mk> > > > > -# we could be on HEAD where CC is in fact clang 3.3 but since we > > have no -# __FreeBSD_version tag from when the 3.3 import happened > > we have to do some -# probing > > -# > > -.if(${OSVERSION} >= 1000000) > > -_CLANG!= cc --version | ${HEAD} -1 | ${SED} -e 's/.*clang > > version \([0-9]\)\.\([0-9]\).*/\1\2/' -CFLAGS+= > > -Wno-unused-comparison +.if(${OSVERSION} >= 1000024) > > +CCISCLANG!= ${CC} --version | ${HEAD} -1 | ${GREP} 'clang' > > .endif > > > > -.if ${CC} == clang > > +.if ${CC} == clang || defined(CCISCLANG) > > CFLAGS+= -Wno-unused-comparison > > .endif > > > > This code is rather strange. The contents of CCISCLANG are totally > irrelevant to the code, and if OSVERSION >= 1000024 then CCISCLANG is > always defined. > > You probably want > > .if ${CC} == clang || !empty(CCISCLANG) > > Chris > Good catch! I've just fixed it. Emanuel
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130803223421.3ab76cbd67172446cde8c208>