From b79e8b369649f053ce3a39d3d178e4e2dbcf9993 Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Sat, 24 Sep 2011 18:04:08 +0000 Subject: Fix to building and linking for unit tests. (This should fix the segfaulting units in optimized-dynamic. The problem was that the code incorrectly determined the address of one of the thread-scoped global variables, and I think it's because the same library was linked twice into the unit test in two different ways, confusing the runtime support code.) --- src/parser/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/parser/Makefile.am') diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am index d87db20f5..aca11bbd8 100644 --- a/src/parser/Makefile.am +++ b/src/parser/Makefile.am @@ -21,7 +21,7 @@ SUBDIRS = smt smt2 cvc lib_LTLIBRARIES = libcvc4parser.la if HAVE_CXXTESTGEN -noinst_LTLIBRARIES = libcvc4parser_noinst.la +check_LTLIBRARIES = libcvc4parser_noinst.la endif libcvc4parser_la_LDFLAGS = $(ANTLR_LDFLAGS) \ @@ -39,7 +39,7 @@ libcvc4parser_noinst_la_LIBADD = \ @builddir@/smt2/libparsersmt2.la \ @builddir@/cvc/libparsercvc.la \ @builddir@/../lib/libreplacements.la \ - -L@builddir@/.. -lcvc4 + @builddir@/../libcvc4_noinst.la libcvc4parser_la_SOURCES = \ antlr_input.h \ -- cgit v1.2.3