Mesa (master): glsl: Add pthread libs to cache_test

Timothy Arceri tarceri at kemper.freedesktop.org
Wed Oct 26 22:49:43 UTC 2016


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

Author: Rhys Kidd <rhyskidd at gmail.com>
Date:   Wed Oct 26 00:13:24 2016 -0400

glsl: Add pthread libs to cache_test

Fixes the following compile error, present when the SHA1 library is libgcrypt:

  CCLD     glsl/tests/cache-test
glsl/.libs/libglsl.a(libmesautil_la-mesa-sha1.o): In function `call_once':
/mesa/src/util/../../include/c11/threads_posix.h:96: undefined reference to `pthread_once'

Signed-off-by: Rhys Kidd <rhyskidd at gmail.com>
Reviewed-by: Timothy Arceri <timothy.arceri at collabora.com>

---

 src/compiler/Makefile.glsl.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am
index 8cc0a4a..8bfb902 100644
--- a/src/compiler/Makefile.glsl.am
+++ b/src/compiler/Makefile.glsl.am
@@ -62,8 +62,11 @@ glsl_tests_blob_test_LDADD =				\
 
 glsl_tests_cache_test_SOURCES =				\
 	glsl/tests/cache_test.c
+glsl_tests_cache_test_CFLAGS =				\
+	$(PTHREAD_CFLAGS)
 glsl_tests_cache_test_LDADD =				\
-	glsl/libglsl.la
+	glsl/libglsl.la					\
+	$(PTHREAD_LIBS)
 
 glsl_tests_general_ir_test_SOURCES =			\
 	glsl/tests/builtin_variable_test.cpp		\




More information about the mesa-commit mailing list