diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-03-17 00:58:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-17 00:59:00 +0000 |
| commit | d84ef9ffac6e81c6482e4082660d41a208b06945 (patch) | |
| tree | a921971914516fe91a9a965c9ff87146998d5482 | |
| parent | 9da29e41a4823d0ec7c6a82e631ead614fe1128b (diff) | |
| parent | 70dd19d50bac5ce477a7b5346dc07ecc1fbbc0d7 (diff) | |
| download | llvm-ndk-r15-release.tar.gz | |
Merge "Fixes for host bionic support" into devndk-r15-beta2ndk-r15-beta1ndk-r15-release
| -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 16296b2a74ac..766033e0896a 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 f24f92293390..63906f0fa0c7 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 |