configure.ac: Move llvm_set_environment_variables higher.
This moves the function to get the LLVM environment variables higher in the file. It still needs to be below the "--enable-opencl" because it uses $enable_opencl. It can be called without condition now as it only throws errors if openCL is enabled. v5: HAVE_MESA_LLVM is only used for gallium. Rename it to HAVE_GALLIUM_LLVM. In order to only link LLVM when it is needed, HAVE_GALLIUM_LLVM is only set if "$enable-gallium-llvm" is yes. Signed-off-by: Tobias Droste <tdroste@gmx.de> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
parent
19ff3975de
commit
9d14a25bee
11
configure.ac
11
configure.ac
|
@ -1189,6 +1189,8 @@ AC_ARG_ENABLE([gallium-tests],
|
||||||
[enable_gallium_tests="$enableval"],
|
[enable_gallium_tests="$enableval"],
|
||||||
[enable_gallium_tests=no])
|
[enable_gallium_tests=no])
|
||||||
|
|
||||||
|
llvm_set_environment_variables
|
||||||
|
|
||||||
# Option for Gallium drivers
|
# Option for Gallium drivers
|
||||||
|
|
||||||
# Keep this in sync with the --with-gallium-drivers help string default value
|
# Keep this in sync with the --with-gallium-drivers help string default value
|
||||||
|
@ -2285,12 +2287,6 @@ if test "x$enable_gallium_llvm" = xauto; then
|
||||||
i*86|x86_64|amd64) enable_gallium_llvm=yes;;
|
i*86|x86_64|amd64) enable_gallium_llvm=yes;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
if test "x$enable_gallium_llvm" = xyes || test "x$HAVE_RADEON_VULKAN" = xyes; then
|
|
||||||
llvm_set_environment_variables
|
|
||||||
else
|
|
||||||
MESA_LLVM=0
|
|
||||||
LLVM_VERSION_INT=0
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl Directory for XVMC libs
|
dnl Directory for XVMC libs
|
||||||
AC_ARG_WITH([xvmc-libdir],
|
AC_ARG_WITH([xvmc-libdir],
|
||||||
|
@ -2626,7 +2622,8 @@ AM_CONDITIONAL(NEED_RADEON_DRM_WINSYS, test "x$HAVE_GALLIUM_R300" = xyes -o \
|
||||||
AM_CONDITIONAL(NEED_WINSYS_XLIB, test "x$enable_glx" = xgallium-xlib)
|
AM_CONDITIONAL(NEED_WINSYS_XLIB, test "x$enable_glx" = xgallium-xlib)
|
||||||
AM_CONDITIONAL(NEED_RADEON_LLVM, test x$NEED_RADEON_LLVM = xyes)
|
AM_CONDITIONAL(NEED_RADEON_LLVM, test x$NEED_RADEON_LLVM = xyes)
|
||||||
AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes)
|
AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes)
|
||||||
AM_CONDITIONAL(HAVE_MESA_LLVM, test x$MESA_LLVM = x1)
|
AM_CONDITIONAL(HAVE_GALLIUM_LLVM, test "x$MESA_LLVM" = x1 -a \
|
||||||
|
"x$enable_gallium_llvm" = xyes)
|
||||||
AM_CONDITIONAL(USE_VC4_SIMULATOR, test x$USE_VC4_SIMULATOR = xyes)
|
AM_CONDITIONAL(USE_VC4_SIMULATOR, test x$USE_VC4_SIMULATOR = xyes)
|
||||||
if test "x$USE_VC4_SIMULATOR" = xyes -a "x$HAVE_GALLIUM_ILO" = xyes; then
|
if test "x$USE_VC4_SIMULATOR" = xyes -a "x$HAVE_GALLIUM_ILO" = xyes; then
|
||||||
AC_MSG_ERROR([VC4 simulator on x86 replaces i965 driver build, so ilo must be disabled.])
|
AC_MSG_ERROR([VC4 simulator on x86 replaces i965 driver build, so ilo must be disabled.])
|
||||||
|
|
|
@ -20,7 +20,7 @@ libgallium_la_SOURCES = \
|
||||||
$(NIR_SOURCES) \
|
$(NIR_SOURCES) \
|
||||||
$(GENERATED_SOURCES)
|
$(GENERATED_SOURCES)
|
||||||
|
|
||||||
if HAVE_MESA_LLVM
|
if HAVE_GALLIUM_LLVM
|
||||||
|
|
||||||
AM_CFLAGS += \
|
AM_CFLAGS += \
|
||||||
$(LLVM_CFLAGS)
|
$(LLVM_CFLAGS)
|
||||||
|
|
|
@ -114,7 +114,7 @@ d3dadapter9_la_LIBADD += \
|
||||||
|
|
||||||
endif # HAVE_GALLIUM_STATIC_TARGETS
|
endif # HAVE_GALLIUM_STATIC_TARGETS
|
||||||
|
|
||||||
if HAVE_MESA_LLVM
|
if HAVE_GALLIUM_LLVM
|
||||||
nodist_EXTRA_d3dadapter9_la_SOURCES = dummy.cpp
|
nodist_EXTRA_d3dadapter9_la_SOURCES = dummy.cpp
|
||||||
d3dadapter9_la_LDFLAGS += $(LLVM_LDFLAGS)
|
d3dadapter9_la_LDFLAGS += $(LLVM_LDFLAGS)
|
||||||
d3dadapter9_la_LIBADD += $(LLVM_LIBS)
|
d3dadapter9_la_LIBADD += $(LLVM_LIBS)
|
||||||
|
|
|
@ -112,7 +112,7 @@ gallium_dri_la_LIBADD += \
|
||||||
|
|
||||||
endif # HAVE_GALLIUM_STATIC_TARGETS
|
endif # HAVE_GALLIUM_STATIC_TARGETS
|
||||||
|
|
||||||
if HAVE_MESA_LLVM
|
if HAVE_GALLIUM_LLVM
|
||||||
gallium_dri_la_LIBADD += $(LLVM_LIBS)
|
gallium_dri_la_LIBADD += $(LLVM_LIBS)
|
||||||
gallium_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
|
gallium_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -75,7 +75,7 @@ lib@GL_LIB@_la_LIBADD = \
|
||||||
$(GL_LIB_DEPS) \
|
$(GL_LIB_DEPS) \
|
||||||
$(CLOCK_LIB)
|
$(CLOCK_LIB)
|
||||||
|
|
||||||
if HAVE_MESA_LLVM
|
if HAVE_GALLIUM_LLVM
|
||||||
lib@GL_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
|
lib@GL_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
|
||||||
AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
|
AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
|
||||||
lib@GL_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS)
|
lib@GL_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS)
|
||||||
|
|
|
@ -63,7 +63,7 @@ libomx_mesa_la_LIBADD += \
|
||||||
|
|
||||||
endif # HAVE_GALLIUM_STATIC_TARGETS
|
endif # HAVE_GALLIUM_STATIC_TARGETS
|
||||||
|
|
||||||
if HAVE_MESA_LLVM
|
if HAVE_GALLIUM_LLVM
|
||||||
libomx_mesa_la_LIBADD += $(LLVM_LIBS)
|
libomx_mesa_la_LIBADD += $(LLVM_LIBS)
|
||||||
libomx_mesa_la_LDFLAGS += $(LLVM_LDFLAGS)
|
libomx_mesa_la_LDFLAGS += $(LLVM_LDFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -68,7 +68,7 @@ lib@OSMESA_LIB@_la_LIBADD = \
|
||||||
$(OSMESA_LIB_DEPS) \
|
$(OSMESA_LIB_DEPS) \
|
||||||
$(CLOCK_LIB)
|
$(CLOCK_LIB)
|
||||||
|
|
||||||
if HAVE_MESA_LLVM
|
if HAVE_GALLIUM_LLVM
|
||||||
AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
|
AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
|
||||||
lib@OSMESA_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS)
|
lib@OSMESA_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS)
|
||||||
lib@OSMESA_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
|
lib@OSMESA_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
|
||||||
|
|
|
@ -71,7 +71,7 @@ AM_LDFLAGS += \
|
||||||
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/pipe-loader/pipe.sym
|
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/pipe-loader/pipe.sym
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if HAVE_MESA_LLVM
|
if HAVE_GALLIUM_LLVM
|
||||||
PIPE_LIBS += $(LLVM_LIBS)
|
PIPE_LIBS += $(LLVM_LIBS)
|
||||||
AM_LDFLAGS += $(LLVM_LDFLAGS)
|
AM_LDFLAGS += $(LLVM_LDFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -62,7 +62,7 @@ gallium_drv_video_la_LIBADD += \
|
||||||
|
|
||||||
endif # HAVE_GALLIUM_STATIC_TARGETS
|
endif # HAVE_GALLIUM_STATIC_TARGETS
|
||||||
|
|
||||||
if HAVE_MESA_LLVM
|
if HAVE_GALLIUM_LLVM
|
||||||
gallium_drv_video_la_LIBADD += $(LLVM_LIBS)
|
gallium_drv_video_la_LIBADD += $(LLVM_LIBS)
|
||||||
gallium_drv_video_la_LDFLAGS += $(LLVM_LDFLAGS)
|
gallium_drv_video_la_LDFLAGS += $(LLVM_LDFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -72,7 +72,7 @@ libvdpau_gallium_la_LIBADD += \
|
||||||
|
|
||||||
endif # HAVE_GALLIUM_STATIC_TARGETS
|
endif # HAVE_GALLIUM_STATIC_TARGETS
|
||||||
|
|
||||||
if HAVE_MESA_LLVM
|
if HAVE_GALLIUM_LLVM
|
||||||
libvdpau_gallium_la_LIBADD += $(LLVM_LIBS)
|
libvdpau_gallium_la_LIBADD += $(LLVM_LIBS)
|
||||||
libvdpau_gallium_la_LDFLAGS += $(LLVM_LDFLAGS)
|
libvdpau_gallium_la_LDFLAGS += $(LLVM_LDFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -86,7 +86,7 @@ libxatracker_la_LIBADD += \
|
||||||
|
|
||||||
endif # HAVE_GALLIUM_STATIC_TARGETS
|
endif # HAVE_GALLIUM_STATIC_TARGETS
|
||||||
|
|
||||||
if HAVE_MESA_LLVM
|
if HAVE_GALLIUM_LLVM
|
||||||
libxatracker_la_LIBADD += $(LLVM_LIBS)
|
libxatracker_la_LIBADD += $(LLVM_LIBS)
|
||||||
libxatracker_la_LDFLAGS += $(LLVM_LDFLAGS)
|
libxatracker_la_LDFLAGS += $(LLVM_LDFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -60,7 +60,7 @@ libXvMCgallium_la_LIBADD += \
|
||||||
|
|
||||||
endif # HAVE_GALLIUM_STATIC_TARGETS
|
endif # HAVE_GALLIUM_STATIC_TARGETS
|
||||||
|
|
||||||
if HAVE_MESA_LLVM
|
if HAVE_GALLIUM_LLVM
|
||||||
libXvMCgallium_la_LIBADD += $(LLVM_LIBS)
|
libXvMCgallium_la_LIBADD += $(LLVM_LIBS)
|
||||||
libXvMCgallium_la_LDFLAGS += $(LLVM_LDFLAGS)
|
libXvMCgallium_la_LDFLAGS += $(LLVM_LDFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue