diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-03-15 16:58:24 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-03-15 23:08:32 -0700 |
| commit | 399e474681d159a5bbe9e92ab81ade28140cc9c4 (patch) | |
| tree | b858a9b0ca4a26adee7c9f3394e52f5ae32541b2 | |
| parent | 6c19fec81f03d7d82601b396f4a8a2c335ae7d1d (diff) | |
| download | llvm-399e474681d159a5bbe9e92ab81ade28140cc9c4.tar.gz | |
Fixes for host bionic support
This enables linux_bionic for llvm-headers-no-generated-headers, which
was missing.
Then add some more ifdefs in the host-side config.h (that's used for
linux_bionic) to deal with differences between bionic and glibc/darwin's
libc.
Bug: 31559095
Test: Enable host bionic, run soong
Change-Id: Ie01d3317eb21edd861163722d40a354207fada66
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | host/include/llvm/Config/config.h | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 0302e6593017..a29a38a3c184 100644 --- a/Android.bp +++ b/Android.bp @@ -100,6 +100,9 @@ cc_library_headers { host: { export_include_dirs: ["host/include"], }, + linux_bionic: { + enabled: true, + }, windows: { enabled: true, }, diff --git a/host/include/llvm/Config/config.h b/host/include/llvm/Config/config.h index 408b8a5c5aa5..9563335abbd7 100644 --- a/host/include/llvm/Config/config.h +++ b/host/include/llvm/Config/config.h @@ -115,7 +115,9 @@ #define HAVE_ERROR_T 1 /* Define to 1 if you have the <execinfo.h> header file. */ +#ifndef __BIONIC__ #define HAVE_EXECINFO_H 1 +#endif /* Define to 1 if you have the <fcntl.h> header file. */ #define HAVE_FCNTL_H 1 @@ -309,7 +311,9 @@ #define HAVE_OPENDIR 1 /* Define to 1 if you have the `posix_spawn' function. */ +#ifndef __BIONIC__ #define HAVE_POSIX_SPAWN 1 +#endif /* Define to 1 if you have the `powf' function. */ #define HAVE_POWF 1 @@ -485,7 +489,9 @@ #define HAVE_SYS_WAIT_H 1 /* Define if the setupterm() function is supported this platform. */ +#ifndef __BIONIC__ #define HAVE_TERMINFO 1 +#endif /* Define to 1 if you have the <termios.h> header file. */ #define HAVE_TERMIOS_H 1 |