From 9574b6c8ec0096480a2954774b95c4165df51799 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sun, 22 Nov 2015 17:23:21 -0600 Subject: do not link libcompatnoopt if it is unneeded/built from andy-js on github, fix #158 --- crypto/Makefile.am | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'crypto') diff --git a/crypto/Makefile.am b/crypto/Makefile.am index f45e8e9..b7f4891 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -13,7 +13,10 @@ EXTRA_DIST += CMakeLists.txt EXTRA_DIST += compat/strcasecmp.c libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined -libcrypto_la_LIBADD = libcompat.la libcompatnoopt.la +libcrypto_la_LIBADD = libcompat.la +if !HAVE_EXPLICIT_BZERO +libcrypto_la_LIBADD += libcompatnoopt.la +endif libcrypto_la_CPPFLAGS = $(AM_CPPFLAGS) libcrypto_la_CPPFLAGS += -DLIBRESSL_INTERNAL libcrypto_la_CPPFLAGS += -DOPENSSL_NO_HW_PADLOCK @@ -31,13 +34,15 @@ else libcrypto_la_CPPFLAGS += -DOPENSSLDIR=\"$(sysconfdir)/ssl\" endif -noinst_LTLIBRARIES = libcompat.la libcompatnoopt.la +noinst_LTLIBRARIES = libcompat.la # compatibility functions that need to be built without optimizations +if !HAVE_EXPLICIT_BZERO +noinst_LTLIBRARIES += libcompatnoopt.la + libcompatnoopt_la_CFLAGS = -O0 libcompatnoopt_la_SOURCES = -if !HAVE_EXPLICIT_BZERO if HOST_WIN libcompatnoopt_la_SOURCES += compat/explicit_bzero_win.c else -- cgit v1.2.3-55-g6feb