From: Emil Velikov <emil.veli...@collabora.com>
The options allows you to specify custom location of clang and friends.
That may have been required for old and buggy llvm-config, which could
produce the wrong path.
This isn't the case with LLVM 5.0.1 at least, so we no longer need this
hack.
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
---
configure.ac | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8f0557cef2b..f41f60d95a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2424,9 +2424,9 @@ dnl
AC_ARG_WITH([clang-libdir],
[AS_HELP_STRING([--with-clang-libdir],
- [Path to Clang libraries @<:@default=llvm-config --libdir@:>@])],
- [CLANG_LIBDIR="$withval"],
- [CLANG_LIBDIR=''])
+ [DEPRECATED: Detected automatically based on llvm-config])],
+ [AC_MSG_ERROR([--with-clang-libdir is deprecated. Detected automatically
based on llvm-config])],
+ [])
PKG_CHECK_EXISTS([libclc], [have_libclc=yes], [have_libclc=no])
@@ -2492,13 +2492,7 @@ if test "x$enable_opencl" = xyes; then
llvm_add_component "profiledata" "opencl"
llvm_add_optional_component "coroutines" "opencl"
- dnl Check for Clang internal headers
- if test -z "$CLANG_LIBDIR"; then
- CLANG_LIBDIR=${LLVM_LIBDIR}
- fi
- CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
- AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"],
- [AC_MSG_ERROR([Could not find clang internal header stddef.h in
$CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the
clang libraries.])])
+ CLANG_RESOURCE_DIR=${LLVM_LIBDIR}/clang/${LLVM_VERSION}
fi
AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes)
AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes)
--
2.19.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
