From owner-svn-ports-all@freebsd.org Thu Sep 1 22:06:33 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33204BCC69F; Thu, 1 Sep 2016 22:06:33 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0F665875; Thu, 1 Sep 2016 22:06:32 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u81M6Wfi082042; Thu, 1 Sep 2016 22:06:32 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u81M6WjO082039; Thu, 1 Sep 2016 22:06:32 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201609012206.u81M6WjO082039@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Thu, 1 Sep 2016 22:06:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421246 - in head/devel: llvm-devel llvm38 llvm39 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Sep 2016 22:06:33 -0000 Author: brooks Date: Thu Sep 1 22:06:31 2016 New Revision: 421246 URL: https://svnweb.freebsd.org/changeset/ports/421246 Log: Attempt to fix build on platforms that don't support COMPILER_RT. Make GOLD an amd64-only option (not belived to be a functional change). PR: 212312 Modified: head/devel/llvm-devel/Makefile head/devel/llvm38/Makefile head/devel/llvm39/Makefile Modified: head/devel/llvm-devel/Makefile ============================================================================== --- head/devel/llvm-devel/Makefile Thu Sep 1 20:27:24 2016 (r421245) +++ head/devel/llvm-devel/Makefile Thu Sep 1 22:06:31 2016 (r421246) @@ -33,8 +33,8 @@ GH_TAGNAME= ${LLVM_COMMIT} .include "Makefile.snapshot" -OPTIONS_DEFINE= CLANG DOCS EXTRAS GOLD LIT LLD LLDB -OPTIONS_DEFINE_amd64= COMPILER_RT OPENMP +OPTIONS_DEFINE= CLANG DOCS EXTRAS LIT LLD LLDB +OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFINE_i386= COMPILER_RT OPTIONS_DEFAULT= CLANG EXTRAS LIT LLD LLDB OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP @@ -183,6 +183,18 @@ COMMANDS+= lldb \ _USES_PYTHON= python .endif +.if ! ${OPTIONS_DEFINE:MCOMPILER_RT} +# Hack to disable COMPILER_RT in plist of unsupported architectures +PLIST_SUB+= COMPILER_RT="@comment " +.else +.endif + +.if ! ${OPTIONS_DEFINE:MGOLD} +# Hack to disable GOLD in plist of unsupported architectures +PLIST_SUB+= GOLD="@comment " +.else +.endif + .if ! ${OPTIONS_DEFINE:MOPENMP} # Hack to disable OPENMP in plist of unsupported architectures PLIST_SUB+= OPENMP="@comment " Modified: head/devel/llvm38/Makefile ============================================================================== --- head/devel/llvm38/Makefile Thu Sep 1 20:27:24 2016 (r421245) +++ head/devel/llvm38/Makefile Thu Sep 1 22:06:31 2016 (r421246) @@ -32,8 +32,8 @@ SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" L CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX} CMAKE_ARGS= -OPTIONS_DEFINE= CLANG DOCS EXTRAS GOLD LIT LLD LLDB -OPTIONS_DEFINE_amd64= COMPILER_RT OPENMP +OPTIONS_DEFINE= CLANG DOCS EXTRAS LIT LLD LLDB +OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFINE_i386= COMPILER_RT OPTIONS_DEFAULT= CLANG EXTRAS LIT LLD LLDB OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP @@ -173,6 +173,18 @@ COMMANDS+= argdumper \ _USES_PYTHON= python .endif +.if ! ${OPTIONS_DEFINE:MCOMPILER_RT} +# Hack to disable COMPILER_RT in plist of unsupported architectures +PLIST_SUB+= COMPILER_RT="@comment " +.else +.endif + +.if ! ${OPTIONS_DEFINE:MGOLD} +# Hack to disable GOLD in plist of unsupported architectures +PLIST_SUB+= GOLD="@comment " +.else +.endif + .if ! ${OPTIONS_DEFINE:MOPENMP} # Hack to disable OPENMP in plist of unsupported architectures PLIST_SUB+= OPENMP="@comment " Modified: head/devel/llvm39/Makefile ============================================================================== --- head/devel/llvm39/Makefile Thu Sep 1 20:27:24 2016 (r421245) +++ head/devel/llvm39/Makefile Thu Sep 1 22:06:31 2016 (r421246) @@ -33,8 +33,8 @@ SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" L CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX} CMAKE_ARGS= -OPTIONS_DEFINE= CLANG DOCS EXTRAS GOLD LIT LLD LLDB -OPTIONS_DEFINE_amd64= COMPILER_RT OPENMP +OPTIONS_DEFINE= CLANG DOCS EXTRAS LIT LLD LLDB +OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFINE_i386= COMPILER_RT OPTIONS_DEFAULT= CLANG EXTRAS LIT LLD LLDB OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP @@ -183,6 +183,18 @@ COMMANDS+= argdumper \ _USES_PYTHON= python .endif +.if ! ${OPTIONS_DEFINE:MCOMPILER_RT} +# Hack to disable COMPILER_RT in plist of unsupported architectures +PLIST_SUB+= COMPILER_RT="@comment " +.else +.endif + +.if ! ${OPTIONS_DEFINE:MGOLD} +# Hack to disable GOLD in plist of unsupported architectures +PLIST_SUB+= GOLD="@comment " +.else +.endif + .if ! ${OPTIONS_DEFINE:MOPENMP} # Hack to disable OPENMP in plist of unsupported architectures PLIST_SUB+= OPENMP="@comment "