Commit 4cbd6e46 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'bug6173_rebased'

parents 4432fa40 8c015810

acinclude.m4

+6 −3
Original line number Diff line number Diff line
@@ -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;],

    AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], [fputs("", stdout)])],

                  [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"

    LDFLAGS="$tor_saved_LDFLAGS"

    LIBS="$tor_saved_LIBS"

changes/bug6173

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.