diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-18 11:52:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-18 11:52:03 -0400 |
| commit | 4cbd6e46ef6d64e293dd03b0c453a2750684563a (patch) | |
| tree | 0b9f8fa87b8acedb32c72957402e47c537a159ab | |
| parent | 4432fa40dda2a79da7c2d88d2fe83462ed919d7b (diff) | |
| parent | 8c0158101cd18c1854c45e51d28316b517184e36 (diff) | |
| download | tor-4cbd6e46ef6d64e293dd03b0c453a2750684563a.tar.gz tor-4cbd6e46ef6d64e293dd03b0c453a2750684563a.zip | |
Merge branch 'bug6173_rebased'
| -rw-r--r-- | acinclude.m4 | 9 | ||||
| -rw-r--r-- | changes/bug6173 | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 43280597a4..9ab684877a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -71,9 +71,12 @@ AC_DEFUN([TOR_CHECK_LDFLAGS], [ CFLAGS="$CFLAGS -pedantic -Werror" LDFLAGS="$LDFLAGS $2 $1" LIBS="$LIBS $3" - AC_TRY_LINK([], [return 0;], - [AS_VAR_SET(VAR,yes)], - [AS_VAR_SET(VAR,no)]) + AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], [fputs("", stdout)])], + [AS_VAR_SET(VAR,yes)], + [AS_VAR_SET(VAR,no)], + [AC_TRY_LINK([], [return 0;], + [AS_VAR_SET(VAR,yes)], + [AS_VAR_SET(VAR,no)])]) CFLAGS="$tor_saved_CFLAGS" LDFLAGS="$tor_saved_LDFLAGS" LIBS="$tor_saved_LIBS" diff --git a/changes/bug6173 b/changes/bug6173 new file mode 100644 index 0000000000..3b467a9aca --- /dev/null +++ b/changes/bug6173 @@ -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. + |