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

Merge branch 'bug6173_rebased'

Browse Source
This commit is contained in:
Nick Mathewson 2012-06-18 11:52:03 -04:00
commit 4cbd6e46ef
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
acinclude.m4
View File

@ -71,9 +71,12 @@ AC_DEFUN([TOR_CHECK_LDFLAGS], [
CFLAGS="$CFLAGS -pedantic -Werror" CFLAGS="$CFLAGS -pedantic -Werror"
LDFLAGS="$LDFLAGS $2 $1" LDFLAGS="$LDFLAGS $2 $1"
LIBS="$LIBS $3" LIBS="$LIBS $3"
AC_TRY_LINK([], [return 0;], AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], [fputs("", stdout)])],
[AS_VAR_SET(VAR,yes)], [AS_VAR_SET(VAR,yes)],
[AS_VAR_SET(VAR,no)]) [AS_VAR_SET(VAR,no)],
[AC_TRY_LINK([], [return 0;],
[AS_VAR_SET(VAR,yes)],
[AS_VAR_SET(VAR,no)])])
CFLAGS="$tor_saved_CFLAGS" CFLAGS="$tor_saved_CFLAGS"
LDFLAGS="$tor_saved_LDFLAGS" LDFLAGS="$tor_saved_LDFLAGS"
LIBS="$tor_saved_LIBS" LIBS="$tor_saved_LIBS"

5
changes/bug6173 Normal file
View File

@ -0,0 +1,5 @@
o Major bugfixes:
- Make our linker option detection code more robust against linkers
where a bad combination of options completes successfully but
makes an unrunnable binary. Fixes bug 6173; bugfix on 0.2.3.17-beta.