From 4f4ac13ef6cc2f31d102f178117beb9e40a9378e Mon Sep 17 00:00:00 2001 From: Brian Gix Date: Tue, 5 Nov 2019 14:49:10 -0800 Subject: [PATCH] unit: Fixed Mesh Crypto unit test build for LTO Was erroneously compiling and linking explicit unit test versions of the ELL source dependancies while also linking with the library made from same sources. This created Link Time Optimization (LTO) problems when calling exit(), as there were two copies of the constructors and destructors from ell/log.c. --- Makefile.am | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 84c9712c9..8d419fb30 100644 --- a/Makefile.am +++ b/Makefile.am @@ -524,10 +524,8 @@ if MESH unit_tests += unit/test-mesh-crypto unit_test_mesh_crypto_CPPFLAGS = $(ell_cflags) unit_test_mesh_crypto_SOURCES = unit/test-mesh-crypto.c \ - mesh/crypto.h ell/internal ell/ell.h \ - $(ell_sources) -unit_test_mesh_crypto_LDADD = src/libshared-ell.la \ - $(ell_ldadd) + mesh/crypto.h ell/internal ell/ell.h +unit_test_mesh_crypto_LDADD = $(ell_ldadd) endif if MAINTAINER_MODE -- 2.47.3