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 | 9cd920856549e8078123ac062a7cf95efb30a5b7 (patch) | |
| tree | ac77523361eb8bc840b37b9c2d62d3196ac7aa92 /include | |
| parent | 9e849c73120fd1efcbacc0d8506bfaa7207d6018 (diff) | |
| download | llvm-9cd920856549e8078123ac062a7cf95efb30a5b7.tar.gz llvm-9cd920856549e8078123ac062a7cf95efb30a5b7.tar.bz2 llvm-9cd920856549e8078123ac062a7cf95efb30a5b7.tar.xz | |
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]
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200819 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/llvm/Config/config.h.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in index da5b6c9f64..856569656b 100644 --- a/include/llvm/Config/config.h.in +++ b/include/llvm/Config/config.h.in @@ -33,9 +33,6 @@ /* Directory where gcc is installed. */ #undef GCC_INSTALL_PREFIX -/* Define to 1 if you have the `arc4random' function. */ -#undef HAVE_ARC4RANDOM - /* Define to 1 if you have the `argz_append' function. */ #undef HAVE_ARGZ_APPEND @@ -75,6 +72,10 @@ /* Define to 1 if you have the <cxxabi.h> header file. */ #undef HAVE_CXXABI_H +/* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +#undef HAVE_DECL_ARC4RANDOM + /* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you don't. */ #undef HAVE_DECL_FE_ALL_EXCEPT |