Merge branch 'tor-github/pr/1060'

This commit is contained in:
George Kadianakis 2019-06-11 14:12:22 +03:00
commit a7986755ee
2 changed files with 15 additions and 0 deletions

4
changes/ticket27530 Normal file
View File

@ -0,0 +1,4 @@
o Minor features (compilation):
- Log a more useful error message when we are compiling and one of the
compile-time hardening options we have selected can be linked but
not executed. Closes ticket 27530.

View File

@ -1188,6 +1188,17 @@ m4_ifdef([AS_VAR_IF],[
TOR_CHECK_LDFLAGS(-pie, "$all_ldflags_for_check", "$all_libs_for_check")
fi
TOR_TRY_COMPILE_WITH_CFLAGS(-fwrapv, also_link, CFLAGS_FWRAPV="-fwrapv", true)
AC_MSG_CHECKING([whether we can run hardened binaries])
AC_RUN_IFELSE([AC_LANG_PROGRAM([], [return 0;])],
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
AC_MSG_ERROR([dnl
We can link with compiler hardening options, but we can't run with them.
That's a bad sign! If you must, you can pass --disable-gcc-hardening to
configure, but it would be better to figure out what the underlying problem
is.])],
[AC_MSG_RESULT([cross])])
fi
if test "$fragile_hardening" = "yes"; then