From owner-svn-ports-head@FreeBSD.ORG Thu Dec 6 07:00:02 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CE83D2D7; Thu, 6 Dec 2012 07:00:02 +0000 (UTC) (envelope-from knu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B3D6B8FC12; Thu, 6 Dec 2012 07:00:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB6702wR083968; Thu, 6 Dec 2012 07:00:02 GMT (envelope-from knu@svn.freebsd.org) Received: (from knu@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB6702Kx083967; Thu, 6 Dec 2012 07:00:02 GMT (envelope-from knu@svn.freebsd.org) Message-Id: <201212060700.qB6702Kx083967@svn.freebsd.org> From: Akinori MUSHA Date: Thu, 6 Dec 2012 07:00:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308368 - head/games/stonesoup X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Dec 2012 07:00:02 -0000 Author: knu Date: Thu Dec 6 07:00:02 2012 New Revision: 308368 URL: http://svnweb.freebsd.org/changeset/ports/308368 Log: Revert the future-import from bsd.compiler.mk part, as this may have broken INDEX. Pointed out by: cperciva Feature safe: yes Modified: head/games/stonesoup/Makefile Modified: head/games/stonesoup/Makefile ============================================================================== --- head/games/stonesoup/Makefile Thu Dec 6 06:37:59 2012 (r308367) +++ head/games/stonesoup/Makefile Thu Dec 6 07:00:02 2012 (r308368) @@ -52,27 +52,7 @@ MAKE_ARGS= prefix=${PREFIX} \ .include -.if !defined(COMPILER_TYPE) -.if ${CC:T:Mgcc*} -COMPILER_TYPE:= gcc -.elif ${CC:T:Mclang} -COMPILER_TYPE:= clang -.elif ${CC:T} == "cc" -_COMPILER_VERSION!= ${CC} --version -.if ${_COMPILER_VERSION:Mgcc} -COMPILER_TYPE:= gcc -.elif ${_COMPILER_VERSION:M\(GCC\)} -COMPILER_TYPE:= gcc -.elif ${_COMPILER_VERSION:Mclang} -COMPILER_TYPE:= clang -.endif -.undef _COMPILER_VERSION -.else -COMPILER_TYPE:= ${CC:T} -.endif -.endif - -.if ${COMPILER_TYPE} == "clang" +.if ${CC:T:M*clang*} MAKE_ARGS+= NO_INLINE_DEPGEN=1 .endif