[Mesa-dev] [PATCH] glsl: Do not link builtin_stubs.o into glsl_compiler

[Chad Versace]

[Ian, I want your Tested-by.]

Before this commit, both builtin_stubs.o and builtin_functions.o (via
libglsl.a) were linked into glsl_compiler. It is surprising that this
worked at all, since builtin_functions.o redefines some symbols in
builtin_stubs.o.

CC: Ian Romanick <idr at freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Signed-off-by: Chad Versace <chad at chad-versace.us>
---
 src/glsl/Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index c20a6c9..00b7b91 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -188,11 +188,11 @@ install-dricore: default
 
 ##### RULES #####
 
-glsl_compiler: $(GLSL2_OBJECTS) libglsl.a builtin_stubs.o
-	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) builtin_stubs.o $(LIBS) -o $@
+glsl_compiler: $(GLSL2_OBJECTS) libglsl.a
+	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) $(LIBS) -o $@
 
-glsl_test: $(TEST_OBJECTS) libglsl.a builtin_stubs.o
-	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(TEST_OBJECTS) builtin_stubs.o $(LIBS) -o $@
+glsl_test: $(TEST_OBJECTS) libglsl.a
+	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(TEST_OBJECTS) $(LIBS) -o $@
 
 glcpp: glcpp/glcpp
 glcpp/glcpp: $(GLCPP_OBJECTS)
-- 
1.7.6