Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Dec 2012 13:26:09 +0000 (UTC)
From:      Niclas Zeising <zeising@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r309460 - head/devel/imake
Message-ID:  <201212241326.qBODQ9ux013266@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zeising
Date: Mon Dec 24 13:26:08 2012
New Revision: 309460
URL: http://svnweb.freebsd.org/changeset/ports/309460

Log:
  Attempt to fix build when clang is used.
  Add depenency on ucpp and use that as cpp when clang is cc. [1]
  While here, trim makefile headers. [2]
  
  Submitted by:	kevlo [1], zeising [2]
  Approved by:	kwm, miwi (mentors, implicit)

Modified:
  head/devel/imake/Makefile

Modified: head/devel/imake/Makefile
==============================================================================
--- head/devel/imake/Makefile	Mon Dec 24 13:25:33 2012	(r309459)
+++ head/devel/imake/Makefile	Mon Dec 24 13:26:08 2012	(r309460)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    imake-6
-# Date created:         18 Jun 2004
-# Whom:                 anholt
-#
+# Created by:				Eric Anholt <ahnholt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	imake
 PORTVERSION=	1.0.4
@@ -41,9 +37,7 @@ post-patch:
 
 .include <bsd.port.pre.mk>
 
-# clang's cpp destroys whitespace, particularly hard tabs in makefiles,
-# which is fatal for imake.
-.if defined(CC) && ${CC} == "clang"
+.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024
 BUILD_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 RUN_DEPENDS+=	ucpp:${PORTSDIR}/devel/ucpp
 CONFIGURE_ENV+=	ac_cv_path_RAWCPP="ucpp -s"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212241326.qBODQ9ux013266>