[Mesa-dev] [PATCH] build/glsl: fix android build

Tapani Pälli tapani.palli at intel.com
Thu Aug 16 02:13:50 PDT 2012


Commit 77a3efc6b907943903190b385fdf107c4acfcdca broke android
build that sets its own value for GLSL_SRCDIR. Patch sets the value
in Makefile.sources only if it is not defined previously.

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
---
 src/glsl/Makefile.sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index aafb53e..1529b12 100644
--- a/src/glsl/Makefile.sources
+++ b/src/glsl/Makefile.sources
@@ -1,6 +1,6 @@
 # shared source lists for Makefile, SConscript, and Android.mk
 
-GLSL_SRCDIR = $(top_srcdir)/src/glsl
+GLSL_SRCDIR ?= $(top_srcdir)/src/glsl
 GLSL_BUILDDIR = $(top_builddir)/src/glsl
 
 # libglcpp
-- 
1.7.11.4



More information about the mesa-dev mailing list