From 641f629536c2daf6112fe9d5b904c012bb07b912 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Wed, 22 Mar 2017 15:23:17 -0700 Subject: [PATCH] glsl: Link tests with CLOCK_LIB. Fix 'make check' linking errors with glibc < 2.17. CXXLD glsl/glsl_test glsl/.libs/libglsl.a(libmesautil_la-u_queue.o): In function `u_thread_get_time_nano': src/util/../../src/util/u_thread.h:84: undefined reference to `clock_gettime' Signed-off-by: Vinson Lee --- src/compiler/Makefile.glsl.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am index 761fb93..43fd6a9 100644 --- a/src/compiler/Makefile.glsl.am +++ b/src/compiler/Makefile.glsl.am @@ -66,7 +66,8 @@ glsl_tests_cache_test_CFLAGS = \ $(PTHREAD_CFLAGS) glsl_tests_cache_test_LDADD = \ glsl/libglsl.la \ - $(PTHREAD_LIBS) + $(PTHREAD_LIBS) \ + $(CLOCK_LIB) glsl_tests_general_ir_test_SOURCES = \ glsl/tests/array_refcount_test.cpp \ @@ -83,7 +84,8 @@ glsl_tests_general_ir_test_LDADD = \ glsl/libglsl.la \ glsl/libstandalone.la \ $(top_builddir)/src/libglsl_util.la \ - $(PTHREAD_LIBS) + $(PTHREAD_LIBS) \ + $(CLOCK_LIB) glsl_tests_uniform_initializer_test_SOURCES = \ glsl/tests/copy_constant_to_storage_tests.cpp \ @@ -159,7 +161,8 @@ glsl_glsl_test_LDADD = \ glsl/libglsl.la \ glsl/libstandalone.la \ $(top_builddir)/src/libglsl_util.la \ - $(PTHREAD_LIBS) + $(PTHREAD_LIBS) \ + $(CLOCK_LIB) # We write our own rules for yacc and lex below. We'd rather use automake, # but automake makes it especially difficult for a number of reasons: -- 2.7.4