summaryrefslogtreecommitdiff
path: root/src/common/include.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-03-01 00:33:37 -0500
committerNick Mathewson <nickm@torproject.org>2013-03-01 00:33:37 -0500
commitc72d58cbfff0b0a5e7d9fd226e556c225bb92a76 (patch)
tree557a2d845a6049de0ce92ec81537088973e92eea /src/common/include.am
parent94d0f226e654af787407b089295ee078eab84c7b (diff)
parent97d0872f59b4ac7a56632966ee041782c1152313 (diff)
downloadtor-c72d58cbfff0b0a5e7d9fd226e556c225bb92a76.tar.gz
tor-c72d58cbfff0b0a5e7d9fd226e556c225bb92a76.zip
Merge remote-tracking branch 'public/feature8109'
Diffstat (limited to 'src/common/include.am')
-rw-r--r--src/common/include.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/common/include.am b/src/common/include.am
index b796ebfae8..68275cbcf7 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -14,9 +14,13 @@ else
libor_extra_source=
endif
+src_common_libcurve25519_donna_a_CFLAGS=
+
if BUILD_CURVE25519_DONNA
src_common_libcurve25519_donna_a_SOURCES=\
src/ext/curve25519_donna/curve25519-donna.c
+src_common_libcurve25519_donna_a_CFLAGS+=\
+ @F_OMIT_FRAME_POINTER@
noinst_LIBRARIES+=src/common/libcurve25519_donna.a
LIBDONNA=src/common/libcurve25519_donna.a
else
@@ -30,8 +34,6 @@ LIBDONNA=
endif
endif
-src_common_libcurve25519_donna_a_CFLAGS =
-
if CURVE25519_ENABLED
libcrypto_extra_source=src/common/crypto_curve25519.c
endif