aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.test.include
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-11-11 12:54:54 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2015-11-11 12:54:57 +0100
commit3ac70609345a249a74fad61b70f93e8a19245011 (patch)
treee01cdd3f7fb9535e4f33a0952f077c90154da572 /src/Makefile.test.include
parentcb841e75135e97e05cc7e771fb102a08969e2cb4 (diff)
parent69d05134367da9a897ad14562a1d266750db450a (diff)
Merge pull request #6978
69d0513 build: Use fPIC rather than fPIE for qt objects. (Cory Fields) 17c4d9d build: Split hardening/fPIE options out (Cory Fields)
Diffstat (limited to 'src/Makefile.test.include')
-rw-r--r--src/Makefile.test.include3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index f23a8f41fc..2328d0b4cc 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -93,9 +93,10 @@ BITCOIN_TESTS += \
endif
test_test_bitcoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)
-test_test_bitcoin_CPPFLAGS = $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS)
+test_test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS)
test_test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
$(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1)
+test_test_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
if ENABLE_WALLET
test_test_bitcoin_LDADD += $(LIBBITCOIN_WALLET)
endif