Reported-by: Patrick McMunn <doctorwho...@gmail.com>
Signed-off-by: Ben Widawsky <b...@bwidawsk.net>
---
configure.ac | 21 ++++++++++-----------
debugger/system_routine/Makefile.am | 1 +
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac
index b43f45c..55cc78f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,13 +133,20 @@ if test "x$DUMPER" == xyes; then
fi
AM_CONDITIONAL(HAVE_DUMPER, [test "x$DUMPER" = xyes])
-# Define a configure option for the shadder debugger
+# Define a configure option for the shader debugger
AC_ARG_ENABLE(shader-debugger, AS_HELP_STRING([--enable-shader-debugger],
[Enable shader debugging support [autodetected]]),
[BUILD_SHADER_DEBUGGER="$enableval"],
[BUILD_SHADER_DEBUGGER=auto])
-# Shadder debugger depends on python3, intel-genasm and objcopy
+# Shader debugger depends on python3, intel-genasm and objcopy
if test "x$BUILD_SHADER_DEBUGGER" != xno; then
+ GEN4ASM = assembler/intel-gen4asm
+ # Check that the assembler is built
+ if test "$enable_assembler" = xno; then
+ AC_MSG_ERROR([Shader debugger requested, but assembler not
build not found.])
+ BUILD_SHADER_DEBUGGER=no
+ fi
+
# Check Python 3 is installed
if test "$PYTHON" = ":" ; then
if test "x$BUILD_SHADER_DEBUGGER" = xyes; then
@@ -148,15 +155,7 @@ if test "x$BUILD_SHADER_DEBUGGER" != xno; then
BUILD_SHADER_DEBUGGER=no
fi
fi
- # Check for the Intel Chipset assembler compiler
- AC_PATH_PROGS([GEN4ASM], intel-gen4asm)
- if test -z "$GEN4ASM" ; then
- if test "x$BUILD_SHADER_DEBUGGER" = xyes; then
- AC_MSG_ERROR([Shader debugger requested, but
intel-gen4asm not found.])
- else
- BUILD_SHADER_DEBUGGER=no
- fi
- fi
+
# Check for the objcopy GNU binary utiliy command
AC_PATH_PROGS([OBJCOPY], objcopy)
if test -z "$OBJCOPY" ; then
diff --git a/debugger/system_routine/Makefile.am
b/debugger/system_routine/Makefile.am
index 03f0f0f..95d8fb6 100644
--- a/debugger/system_routine/Makefile.am
+++ b/debugger/system_routine/Makefile.am
@@ -3,6 +3,7 @@ noinst_PROGRAMS = eviction_macro sr tiny
nodist_sr_SOURCES = sr.c
nodist_tiny_SOURCES = tiny.c
+GEN4ASM = $(top_builddir)/assembler/intel-gen4asm
GEN4ASM_FLAGS = -g6 -a -b
ASM_CPPFLAGS = \
-x assembler-with-cpp \
--
1.8.5.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
