cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to fix build on platforms that don't support COMPILER_RT.

Browse Source 
Make GOLD an amd64-only option (not belived to be a functional change).

PR:		212312
This commit is contained in:
Brooks Davis 2016-09-01 22:06:31 +00:00
parent 7a18a2979e
commit aced7c2b16
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=421246
3 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devel/llvm-devel/Makefile
View File

@ -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 "

16
devel/llvm38/Makefile
View File

@ -32,8 +32,8 @@ SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
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 "

16
devel/llvm39/Makefile
View File

@ -33,8 +33,8 @@ SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
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 "