diff options
author | Todd Fiala <tfiala@google.com> | 2014-02-05 05:04:36 +0000 |
---|---|---|
committer | Todd Fiala <tfiala@google.com> | 2014-02-05 05:04:36 +0000 |
commit | 4ccfe392ed2cbe1670ed33819ea57efe42b9c3ba (patch) | |
tree | 0d3b04fa9d22d1fb287b7a84b4ab8e5ed41843e7 /llvm/configure | |
parent | 02eac9a27042dedcf3ff96c984aaee7a0094e5ff (diff) | |
download | bcm5719-llvm-4ccfe392ed2cbe1670ed33819ea57efe42b9c3ba.tar.gz bcm5719-llvm-4ccfe392ed2cbe1670ed33819ea57efe42b9c3ba.zip |
Fix configure to find arc4random via header files.
ISSUE:
On Ubuntu 12.04 LTS, arc4random is provided by libbsd.so, which is a
transitive dependency of libedit. If a system had libedit on it that
was implemented in terms of libbsd.so, then the arc4random test,
previously implemented as a linker test, would succeed with -ledit.
However, on Ubuntu this would also require a #include <bsd/stdlib.h>.
This caused a build breakage on configure-based Ubuntu 12.04 with
libedit installed.
FIX:
This fix changes configure to test for arc4random by searching for it
in the standard header files. On Ubuntu 12.04, this test now properly
fails to find arc4random as it is not defined in the default header
locations. It also tweaks the #define names to match the output of the
header check command, which is slightly different than the linker
function check #defines.
I tested the following scenarios:
(1) Ubuntu 12.04 without the libedit package [did not find arc4random,
as expected]
(2) Ubuntu 12.04 with libedit package [properly did not find
arc4random, as expected]
(3) Ubuntu 12.04 with most recent libedit, custom built, and not
dependent on libbsd.so [properly did not find arc4random, as
expected].
(4) FreeBSD 10.0B1 [properly found arc4random, as expected]
llvm-svn: 200819
Diffstat (limited to 'llvm/configure')
-rwxr-xr-x | llvm/configure | 90 |
1 files changed, 88 insertions, 2 deletions
diff --git a/llvm/configure b/llvm/configure index 76440ed1499..2166b691a59 100755 --- a/llvm/configure +++ b/llvm/configure @@ -18527,8 +18527,7 @@ done - -for ac_func in strerror strerror_r setenv arc4random +for ac_func in strerror strerror_r setenv do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -19161,6 +19160,93 @@ _ACEOF fi +{ echo "$as_me:$LINENO: checking whether arc4random is declared" >&5 +echo $ECHO_N "checking whether arc4random is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_arc4random+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef arc4random + char *p = (char *) arc4random; + return !p; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_have_decl_arc4random=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl_arc4random=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_arc4random" >&5 +echo "${ECHO_T}$ac_cv_have_decl_arc4random" >&6; } +if test $ac_cv_have_decl_arc4random = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_ARC4RANDOM 1 +_ACEOF + + +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_ARC4RANDOM 0 +_ACEOF + + +fi + + + { echo "$as_me:$LINENO: checking whether strerror_s is declared" >&5 echo $ECHO_N "checking whether strerror_s is declared... $ECHO_C" >&6; } if test "${ac_cv_have_decl_strerror_s+set}" = set; then |