svn commit: r421246 - in head/devel: llvm-devel llvm38 llvm39
Brooks Davis
brooks at FreeBSD.org
Thu Sep 1 22:06:33 UTC 2016
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 "
More information about the svn-ports-head
mailing list