KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure.ac: Rename the gallium_require_llvm helper 

Drop the gallium prefix since we're about it use it throughout the
configure.

Note we do want to check for enable_gallium_llvm check since (as
explicitly requested) the toggle should mean --enable-llvm. Latter of
which to be resolved with later patches.

Cc: Dave Airlie <airlied@redhat.com>
Cc: "17.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Tobias Droste <tdroste@gmx.de>
This commit is contained in:
Emil Velikov 2017-02-07 16:13:07 +00:00 committed by Emil Velikov
parent f64d4d82bd
commit 514a494415
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.ac
View File

@ -967,6 +967,12 @@ llvm_set_environment_variables() {
fi fi
} }
require_llvm() {
if test "x$enable_gallium_llvm" != "xyes"; then
AC_MSG_ERROR([--enable-gallium-llvm is required when building $1])
fi
}
llvm_check_version_for() { llvm_check_version_for() {
if test "x$MESA_LLVM" = x0; then if test "x$MESA_LLVM" = x0; then
AC_MSG_ERROR([LLVM $1 or newer is required for $2]) AC_MSG_ERROR([LLVM $1 or newer is required for $2])
@ -2195,15 +2201,6 @@ AC_ARG_WITH([d3d-libdir],
[D3D_DRIVER_INSTALL_DIR="${libdir}/d3d"]) [D3D_DRIVER_INSTALL_DIR="${libdir}/d3d"])
AC_SUBST([D3D_DRIVER_INSTALL_DIR]) AC_SUBST([D3D_DRIVER_INSTALL_DIR])
dnl
dnl Gallium helper functions
dnl
gallium_require_llvm() {
if test "x$enable_gallium_llvm" != "xyes"; then
AC_MSG_ERROR([--enable-gallium-llvm is required when building $1])
fi
}
dnl dnl
dnl r300 doesn't strictly require LLVM, but for performance reasons we dnl r300 doesn't strictly require LLVM, but for performance reasons we
dnl highly recommend LLVM usage. So require it at least on x86 and x86_64 dnl highly recommend LLVM usage. So require it at least on x86 and x86_64
@ -2212,7 +2209,7 @@ dnl
r300_require_llvm() { r300_require_llvm() {
case "$host" in *gnux32) return;; esac case "$host" in *gnux32) return;; esac
case "$host_cpu" in case "$host_cpu" in
i*86|x86_64|amd64) gallium_require_llvm $1 i*86|x86_64|amd64) require_llvm $1
;; ;;
esac esac
} }
@ -2345,7 +2342,7 @@ if test -n "$with_gallium_drivers"; then
;; ;;
xswr) xswr)
llvm_check_version_for $LLVM_REQUIRED_SWR "swr" llvm_check_version_for $LLVM_REQUIRED_SWR "swr"
gallium_require_llvm "swr" require_llvm "swr"
swr_require_cxx_feature_flags "C++11" "__cplusplus >= 201103L" \ swr_require_cxx_feature_flags "C++11" "__cplusplus >= 201103L" \
",-std=c++11" \ ",-std=c++11" \