summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-09-10 09:17:25 -0700
committerSage Weil <sage@inktank.com>2013-09-10 09:17:25 -0700
commitdedfccd904494e382f07a565b2bc7a37bf5573b3 (patch)
treed3ad439ce8f07fa3ce19f4f08fcd6b4718b02ccd
parent277d26671310ad268b25dae2f3c9003efe28bb4c (diff)
parent780954e21fbee21ec956e84f07c46d92fd24b78f (diff)
downloadceph-dedfccd904494e382f07a565b2bc7a37bf5573b3.tar.gz
Merge pull request #584 from dachary/master
autoconf: use $(UNITTEST_CXXFLAGS) in tests Reviewed-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/test/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 72246ac748f..6a9e2cb5212 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -321,7 +321,7 @@ libec_example_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.*__erasure_code
erasure_codelib_LTLIBRARIES += libec_example.la
unittest_erasure_code_plugin_SOURCES = test/osd/TestErasureCodePluginExample.cc
-unittest_erasure_code_plugin_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
+unittest_erasure_code_plugin_CXXFLAGS = $(UNITTEST_CXXFLAGS)
unittest_erasure_code_plugin_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
if LINUX
unittest_erasure_code_plugin_LDADD += -ldl
@@ -331,7 +331,7 @@ check_PROGRAMS += unittest_erasure_code_plugin
unittest_erasure_code_example_SOURCES = test/osd/TestErasureCodeExample.cc
noinst_HEADERS += test/osd/ErasureCodeExample.h
-unittest_erasure_code_example_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
+unittest_erasure_code_example_CXXFLAGS = $(UNITTEST_CXXFLAGS)
unittest_erasure_code_example_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL)
check_PROGRAMS += unittest_erasure_code_example