Mesa (master): glsl: Fix dependencies / linkage for glsl_compiler

Ian Romanick idr at kemper.freedesktop.org
Mon Jan 31 23:33:18 UTC 2011


Module: Mesa
Branch: master
Commit: bf9850db2221384f1b92b034391f7149c74bf10e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf9850db2221384f1b92b034391f7149c74bf10e

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Jan 27 17:51:55 2011 -0800

glsl: Fix dependencies / linkage for glsl_compiler

---

 src/glsl/Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 8316dfb..4f30742 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -148,8 +148,8 @@ install:
 
 ##### RULES #####
 
-glsl_compiler: $(GLSL2_OBJECTS) libglsl.a
-	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) $(LIBS) -o $@
+glsl_compiler: $(GLSL2_OBJECTS) libglsl.a builtin_stubs.o
+	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) builtin_stubs.o $(LIBS) -o $@
 
 glcpp/glcpp: $(GLCPP_OBJECTS) libglsl.a
 	$(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLCPP_OBJECTS) $(LIBS) -o $@




More information about the mesa-commit mailing list