[Mesa-dev] [PATCH 15/17] configure.ac: remove dummy radeon_gallium_llvm_check()

[Tobias Droste]

Reviewed-by: Tobias Droste <tdroste at gmx.de>

Am Dienstag, 7. Februar 2017, 22:44:57 CET schrieb Emil Velikov:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> The extra function brings no added benefit as of earlier commit which
> made llvm_require_version (as called by radeon_llvm_check) require LLVM
> (--enable-gallium-llvm).
> 
> Fixes: 5f966a96af7 "configure.ac: Mandate --enable-gallium-llvm when
> checking LLVM version"
> Cc: Tobias Droste <tdroste at gmx.de>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
> Strictly speaking it's not a fix, but a cleanup. I'm fine with keeping
> it separate or merging it in - let me know your preference.
> ---
>  configure.ac | 11 ++---------
>  1 file changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 22758d9702..d0437a71aa 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -2213,13 +2213,6 @@ require_basic_egl() {
>      esac
>  }
> 
> -radeon_gallium_llvm_check() {
> -    if test "x$enable_gallium_llvm" != "xyes"; then
> -        AC_MSG_ERROR([--enable-gallium-llvm is required when building $2])
> -    fi
> -    radeon_llvm_check $*
> -}
> -
>  swr_require_cxx_feature_flags() {
>      feature_name="$1"
>      preprocessor_test="$2"
> @@ -2284,7 +2277,7 @@ if test -n "$with_gallium_drivers"; then
>              PKG_CHECK_MODULES([RADEON], [libdrm >= $LIBDRM_RADEON_REQUIRED
> libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) require_libdrm "r600"
>              if test "x$enable_opencl" = xyes; then
> -                radeon_gallium_llvm_check $LLVM_REQUIRED_R600 "r600"
> +                radeon_llvm_check $LLVM_REQUIRED_R600 "r600"
> 
>                  llvm_add_component "asmparser" "r600"
>                  llvm_add_component "bitreader" "r600"
> @@ -2295,7 +2288,7 @@ if test -n "$with_gallium_drivers"; then
>              PKG_CHECK_MODULES([RADEON], [libdrm >= $LIBDRM_RADEON_REQUIRED
> libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) PKG_CHECK_MODULES([AMDGPU],
> [libdrm >= $LIBDRM_AMDGPU_REQUIRED libdrm_amdgpu >=
> $LIBDRM_AMDGPU_REQUIRED]) require_libdrm "radeonsi"
> -            radeon_gallium_llvm_check $LLVM_REQUIRED_RADEONSI "radeonsi"
> +            radeon_llvm_check $LLVM_REQUIRED_RADEONSI "radeonsi"
>              require_basic_egl "radeonsi"
>              ;;
>          xnouveau)