Merge "Don't force LLVM to be only built as 64-bit on the host."

[android-x86/external-llvm.git] / llvm-host-build.mk

diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index 4bb0ffb..2f71710 100644 (file)
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -12,12 +12,22 @@ LOCAL_CFLAGS +=     \
        -Wall   \
        -W      \
        -Wno-unused-parameter   \
+       -Wno-maybe-uninitialized \
+       -Wno-missing-field-initializers \
        -Wwrite-strings \
+       -Werror \
        -Dsprintf=sprintf \
        $(LOCAL_CFLAGS)
 
-LOCAL_CFLAGS_linux += -Werror
-LOCAL_CFLAGS_darwin += -Werror
+LOCAL_CFLAGS_darwin += -Wno-error=deprecated-declarations
+
+# Disable certain warnings as errors for use with mingw.
+# We also must undefine WIN32_LEAN_AND_MEAN, since it is being passed globally
+# on the command line, and LLVM defines this internally itself.
+LOCAL_CFLAGS_windows += -Wno-error=array-bounds \
+                       -Wno-error=comment \
+                       -Wno-error=return-type \
+                       -UWIN32_LEAN_AND_MEAN
 
 ifeq ($(FORCE_BUILD_LLVM_DISABLE_NDEBUG),true)
 LOCAL_CFLAGS :=        \
@@ -62,8 +72,11 @@ LOCAL_IS_HOST_MODULE := true
 ifeq ($(HOST_PREFER_32_BIT),true)
 LOCAL_MULTILIB := 32
 else
+ifeq (libLLVM, $(filter libLLVM,$(LOCAL_SHARED_LIBRARIES)$(LOCAL_SHARED_LIBRARIES_$(HOST_OS))))
+# Skip building a 32-bit shared object if they are using libLLVM.
 LOCAL_MULTILIB := first
 endif
+endif
 
 ###########################################################
 ## Commands for running tblgen to compile a td file