diff options
| author | Stephen Hines <srhines@google.com> | 2013-07-30 11:21:59 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2013-07-30 22:37:31 -0700 |
| commit | c7ef4e40cf01397ebd25fc9622fc8eb9c61a547d (patch) | |
| tree | c54e077b7c5648c5a317ee106dac5a46092f4536 | |
| parent | b84f869c110f972627adb7696b5e722fe6d724ba (diff) | |
| download | external_llvm-c7ef4e40cf01397ebd25fc9622fc8eb9c61a547d.zip external_llvm-c7ef4e40cf01397ebd25fc9622fc8eb9c61a547d.tar.gz external_llvm-c7ef4e40cf01397ebd25fc9622fc8eb9c61a547d.tar.bz2 | |
Fix Windows build issues for LLVM.
Remove HAVE_SYS_UIO_H redefinition due to Windows build conflicts.
Add dependency on imagehlp.lib/dll.
Change-Id: I41cb9331c1fbde849ff9dc6906cbe9d8ae6bbc50
| -rw-r--r-- | host/include/llvm/Config/config.h | 7 | ||||
| -rw-r--r-- | tools/llvm-as/Android.mk | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/host/include/llvm/Config/config.h b/host/include/llvm/Config/config.h index 090f373..e6c59c6 100644 --- a/host/include/llvm/Config/config.h +++ b/host/include/llvm/Config/config.h @@ -455,13 +455,8 @@ /* Define to 1 if you have the <sys/types.h> header file. */ #define HAVE_SYS_TYPES_H 1 -/* Already defined in system/core/include/arch/darwin-x86/AndroidConfig.h */ -#if !defined(HAVE_SYS_UIO_H) - /* Define to 1 if you have the <sys/uio.h> header file. */ -#define HAVE_SYS_UIO_H 1 - -#endif +/* #define HAVE_SYS_UIO_H 1 */ /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */ #define HAVE_SYS_WAIT_H 1 diff --git a/tools/llvm-as/Android.mk b/tools/llvm-as/Android.mk index 44f3d4f..e58868b 100644 --- a/tools/llvm-as/Android.mk +++ b/tools/llvm-as/Android.mk @@ -8,7 +8,12 @@ include $(CLEAR_VARS) LOCAL_MODULE := llvm-as LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(llvm_as_SRC_FILES) -LOCAL_LDLIBS += -lpthread -lm -ldl +LOCAL_LDLIBS += -lm +ifdef USE_MINGW +LOCAL_LDLIBS += -limagehlp +else +LOCAL_LDLIBS += -lpthread -ldl +endif REQUIRES_EH := 1 REQUIRES_RTTI := 1 |