diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-10-07 10:46:19 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-10-07 10:49:07 +0100 |
| commit | 4d2dba0ba70c2b217a777243e8a89f7a5c5349a9 (patch) | |
| tree | 7014d9ec082fa4e166d266253c8ff8946e0c6a5e | |
| parent | 249051d90fb0ab0bea5561a04ee2a5d0a2238ff1 (diff) | |
Use path for intel-gen4asm derived from pkg-config
As we use pkg-config to determine whether to use intel-gen4asm, we
should also use it to locate the right version of intel-gen4asm to use.
This allows the user to install the assembler in a non-standard path for
cross-builds and similar.
Reported-by: Josh Tripplet <josh@freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55646
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | src/render_program/Makefile.am | 8 | ||||
| -rw-r--r-- | src/xvmc/shader/mc/Makefile.am | 2 | ||||
| -rw-r--r-- | src/xvmc/shader/vld/Makefile.am | 2 |
4 files changed, 15 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 3ecf7ad4..79bba832 100644 --- a/configure.ac +++ b/configure.ac @@ -93,6 +93,15 @@ if test x$ASM != "xno"; then if test x$ASM = "xyes" -a x$gen4asm != "xyes"; then AC_MSG_ERROR([intel-gen4asm support requested but not found]) fi + if test x$gen4asm = "xyes"; then + AC_MSG_CHECKING([path to use for intel-gen4asm]) + INTEL_GEN4ASM="`pkg-config intel-gen4asm --variable=exec_prefix`/bin/intel-gen4asm" + if ! test -e "$INTEL_GEN4ASM"; then + AC_MSG_ERROR([intel-gen4asm enabled, but not found. Tried '$INTEL_GEN4ASM'.]) + fi + AC_MSG_RESULT([$INTEL_GEN4ASM]) + AC_SUBST([INTEL_GEN4ASM]) + fi fi AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes) diff --git a/src/render_program/Makefile.am b/src/render_program/Makefile.am index 1704036c..8b82b2e0 100644 --- a/src/render_program/Makefile.am +++ b/src/render_program/Makefile.am @@ -191,16 +191,16 @@ if HAVE_GEN4ASM SUFFIXES = .g4a .g4b .g5a .g5b .g6a .g6b .g7a .g7b .g4a.g4b: - m4 -I$(srcdir) -s $< > $*.g4m && intel-gen4asm -o $@ $*.g4m && intel-gen4asm -g 5 -o $@.gen5 $*.g4m && rm $*.g4m + m4 -I$(srcdir) -s $< > $*.g4m && @INTEL_GEN4ASM@ -o $@ $*.g4m && @INTEL_GEN4ASM@ -g 5 -o $@.gen5 $*.g4m && rm $*.g4m .g5a.g5b: - m4 -I$(srcdir) -s $< > $*.g5m && intel-gen4asm -g 5 -o $@ $*.g5m && rm $*.g5m + m4 -I$(srcdir) -s $< > $*.g5m && @INTEL_GEN4ASM@ -g 5 -o $@ $*.g5m && rm $*.g5m .g6a.g6b: - m4 -I$(srcdir) -s $< > $*.g6m && intel-gen4asm -g 6 -o $@ $*.g6m && rm $*.g6m + m4 -I$(srcdir) -s $< > $*.g6m && @INTEL_GEN4ASM@ -g 6 -o $@ $*.g6m && rm $*.g6m .g7a.g7b: - m4 -I$(srcdir) -s $< > $*.g7m && intel-gen4asm -g 7 -o $@ $*.g7m && rm $*.g7m + m4 -I$(srcdir) -s $< > $*.g7m && @INTEL_GEN4ASM@ -g 7 -o $@ $*.g7m && rm $*.g7m $(INTEL_G4B): $(INTEL_G4I) $(INTEL_G5B): $(INTEL_G4I) diff --git a/src/xvmc/shader/mc/Makefile.am b/src/xvmc/shader/mc/Makefile.am index 7e3f5b47..c1bff77d 100644 --- a/src/xvmc/shader/mc/Makefile.am +++ b/src/xvmc/shader/mc/Makefile.am @@ -109,7 +109,7 @@ if HAVE_GEN4ASM SUFFIXES = .g4a .g4b .g4a.g4b: - m4 -I$(srcdir) $(srcdir)/$*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && intel-gen4asm -g 5 -o $@.gen5 $*.g4m && rm $*.g4m + m4 -I$(srcdir) $(srcdir)/$*.g4a > $*.g4m && @INTEL_GEN4ASM@ -o $@ $*.g4m && @INTEL_GEN4ASM@ -g 5 -o $@.gen5 $*.g4m && rm $*.g4m $(INTEL_G4B): $(INTEL_G4I) diff --git a/src/xvmc/shader/vld/Makefile.am b/src/xvmc/shader/vld/Makefile.am index 0ce88d24..9280f151 100644 --- a/src/xvmc/shader/vld/Makefile.am +++ b/src/xvmc/shader/vld/Makefile.am @@ -62,7 +62,7 @@ if HAVE_GEN4ASM SUFFIXES = .g4a .g4b .g4a.g4b: - m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && intel-gen4asm -g 5 -o $@.gen5 $*.g4m && rm $*.g4m + m4 $*.g4a > $*.g4m && @INTEL_GEN4ASM@ -o $@ $*.g4m && @INTEL_GEN4ASM@ -g 5 -o $@.gen5 $*.g4m && rm $*.g4m $(INTEL_G4B): $(INTEL_G4I) |