Move valgrind CPPFLAGS into SECP_CONFIG_DEFINES
This commit is contained in:
parent
cc3b8a4f40
commit
4f1a54e41d
|
@ -96,10 +96,6 @@ libsecp256k1_la_CPPFLAGS = $(SECP_INCLUDES) $(SECP_CONFIG_DEFINES)
|
||||||
libsecp256k1_la_LIBADD = $(SECP_LIBS) $(COMMON_LIB) $(PRECOMPUTED_LIB)
|
libsecp256k1_la_LIBADD = $(SECP_LIBS) $(COMMON_LIB) $(PRECOMPUTED_LIB)
|
||||||
libsecp256k1_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_CURRENT):$(LIB_VERSION_REVISION):$(LIB_VERSION_AGE)
|
libsecp256k1_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_CURRENT):$(LIB_VERSION_REVISION):$(LIB_VERSION_AGE)
|
||||||
|
|
||||||
if VALGRIND_ENABLED
|
|
||||||
libsecp256k1_la_CPPFLAGS += -DVALGRIND
|
|
||||||
endif
|
|
||||||
|
|
||||||
noinst_PROGRAMS =
|
noinst_PROGRAMS =
|
||||||
if USE_BENCHMARK
|
if USE_BENCHMARK
|
||||||
noinst_PROGRAMS += bench bench_internal bench_ecmult
|
noinst_PROGRAMS += bench bench_internal bench_ecmult
|
||||||
|
@ -123,10 +119,10 @@ noverify_tests_CPPFLAGS = $(SECP_INCLUDES) $(SECP_TEST_INCLUDES) $(SECP_CONFIG_D
|
||||||
noverify_tests_LDADD = $(SECP_LIBS) $(SECP_TEST_LIBS) $(COMMON_LIB) $(PRECOMPUTED_LIB)
|
noverify_tests_LDADD = $(SECP_LIBS) $(SECP_TEST_LIBS) $(COMMON_LIB) $(PRECOMPUTED_LIB)
|
||||||
noverify_tests_LDFLAGS = -static
|
noverify_tests_LDFLAGS = -static
|
||||||
if VALGRIND_ENABLED
|
if VALGRIND_ENABLED
|
||||||
noverify_tests_CPPFLAGS += -DVALGRIND
|
|
||||||
noinst_PROGRAMS += valgrind_ctime_test
|
noinst_PROGRAMS += valgrind_ctime_test
|
||||||
valgrind_ctime_test_SOURCES = src/valgrind_ctime_test.c
|
valgrind_ctime_test_SOURCES = src/valgrind_ctime_test.c
|
||||||
valgrind_ctime_test_LDADD = libsecp256k1.la $(SECP_LIBS) $(COMMON_LIB)
|
valgrind_ctime_test_LDADD = libsecp256k1.la $(SECP_LIBS) $(COMMON_LIB)
|
||||||
|
valgrind_ctime_test_CPPFLAGS = $(SECP_CONFIG_DEFINES)
|
||||||
endif
|
endif
|
||||||
if !ENABLE_COVERAGE
|
if !ENABLE_COVERAGE
|
||||||
TESTS += tests
|
TESTS += tests
|
||||||
|
|
|
@ -344,7 +344,7 @@ case $set_ecmult_gen_precision in
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if test x"$enable_valgrind" = x"yes"; then
|
if test x"$enable_valgrind" = x"yes"; then
|
||||||
SECP_INCLUDES="$SECP_INCLUDES $VALGRIND_CPPFLAGS"
|
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES $VALGRIND_CPPFLAGS -DVALGRIND"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Add -Werror and similar flags passed from the outside (for testing, e.g., in CI).
|
# Add -Werror and similar flags passed from the outside (for testing, e.g., in CI).
|
||||||
|
|
Loading…
Reference in New Issue