Each driver has to expllicitly call llvm_add_default_components to
add the shared components.
This way we can fail the build if a component is not found and avoid
the recursive solution from a previous version of the pach series.
Signed-off-by: Tobias Droste <tdro...@gmx.de>
---
configure.ac | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 26861f5..4847704 100644
--- a/configure.ac
+++ b/configure.ac
@@ -947,8 +947,6 @@ llvm_get_version() {
LLVM_VERSION_INT=`echo $LLVM_VERSION | sed -e
's/\([[0-9]]\)\.\([[0-9]]\)/\10\2/g'`
fi
- llvm_add_default_components
-
DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT
-DMESA_LLVM_VERSION_PATCH=$LLVM_VERSION_PATCH"
MESA_LLVM=1
else
@@ -984,8 +982,8 @@ llvm_add_component() {
if $LLVM_CONFIG --components | grep -iqw $new_llvm_component ; then
LLVM_COMPONENTS="${LLVM_COMPONENTS} ${new_llvm_component}"
- #else
- # AC_MSG_ERROR([LLVM component '$new_llvm_component' not enabled in
your LLVM build. Required by $driver_name.])
+ else
+ AC_MSG_ERROR([LLVM component '$new_llvm_component' not enabled in your
LLVM build. Required by $driver_name.])
fi
}
@@ -1010,6 +1008,8 @@ radeon_llvm_check() {
llvm_check_version_for $*
llvm_add_target $amdgpu_llvm_target_name $4
+
+ llvm_add_default_components
llvm_add_component "bitreader" $4
llvm_add_component "ipo" $4
@@ -2179,6 +2179,7 @@ if test "x$enable_opencl" = xyes; then
llvm_check_version_for "3" "6" "0" "opencl"
+ llvm_add_default_components
llvm_add_component "all-targets" "opencl"
llvm_add_component "ipos" "opencl"
llvm_add_component "linker" "opencl"
@@ -2394,6 +2395,7 @@ gallium_require_llvm() {
llvm_check_version_for "3" "3" "0" "gallium"
llvm_add_target "x86" "gallium"
+ llvm_add_default_components
;;
esac
}
--
2.10.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
