nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-23 11:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

m4: Change LIBS order of TOR_SEARCH_LIBRARY()

Browse Source 
Some gcc versions do explode if the order of the linker flags are not correct.
One issue was statically building OpenSSL which would require that "-lssl
-lcrypto" be put _before_ the "-lpthread -ldl" flags.

I have not such problem with GCC 10 but does with GCC 9.

Closes #33624

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2021-01-13 09:48:45 -05:00
parent c931eae981
commit c5817a0daf
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
acinclude.m4
View File

@ -166,7 +166,7 @@ AC_CACHE_CHECK([for $1 directory], tor_cv_library_$1_dir, [
for tor_trydir in "$try$1dir" "(system)" "$prefix" /usr/local /usr/pkg $8; do for tor_trydir in "$try$1dir" "(system)" "$prefix" /usr/local /usr/pkg $8; do
LDFLAGS="$tor_saved_LDFLAGS" LDFLAGS="$tor_saved_LDFLAGS"
LIBS="$tor_saved_LIBS $3" LIBS="$3 $tor_saved_LIBS"
CPPFLAGS="$tor_saved_CPPFLAGS" CPPFLAGS="$tor_saved_CPPFLAGS"
if test -z "$tor_trydir" ; then if test -z "$tor_trydir" ; then
@ -219,7 +219,7 @@ AC_CACHE_CHECK([for $1 directory], tor_cv_library_$1_dir, [
CPPFLAGS="$tor_saved_CPPFLAGS" CPPFLAGS="$tor_saved_CPPFLAGS"
]) dnl end cache check ]) dnl end cache check
LIBS="$LIBS $3" LIBS="$3 $LIBS"
if test "$tor_cv_library_$1_dir" != "(system)"; then if test "$tor_cv_library_$1_dir" != "(system)"; then
TOR_EXTEND_CODEPATH($tor_cv_library_$1_dir) TOR_EXTEND_CODEPATH($tor_cv_library_$1_dir)
fi fi

5
changes/ticket33624 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (configure, static build):
- Change our search library configure macro linker flag order so it works
for certain compilers that need the right order. Fixes bug 33624; bugfix
on 0.1.1.0-alpha.