Don't use -Werror on windows, since mingw generates different warnings.

Change-Id: I9ffd8e906674d3a8e4870142cd4b6e64c186bef6

diff --git a/llvm-device-build.mk b/llvm-device-build.mk
index 627ad0c..4f2bc1c 100644 (file)
--- a/llvm-device-build.mk
+++ b/llvm-device-build.mk
@@ -13,10 +13,12 @@ LOCAL_CFLAGS :=     \
        -W      \
        -Wno-unused-parameter   \
        -Wwrite-strings \
-       -Werror \
         -Dsprintf=sprintf \
        $(LOCAL_CFLAGS)
 
+LOCAL_CFLAGS_linux += -Werror
+LOCAL_CFLAGS_darwin += -Werror
+
 # The three inline options together reduce libbcc.so almost 1MB.
 # We move them from global build/core/combo/TARGET_linux-arm.mk
 # to here.

diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index 4e05cb1..4bb0ffb 100644 (file)
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -13,10 +13,12 @@ LOCAL_CFLAGS +=     \
        -W      \
        -Wno-unused-parameter   \
        -Wwrite-strings \
-       -Werror \
        -Dsprintf=sprintf \
        $(LOCAL_CFLAGS)
 
+LOCAL_CFLAGS_linux += -Werror
+LOCAL_CFLAGS_darwin += -Werror
+
 ifeq ($(FORCE_BUILD_LLVM_DISABLE_NDEBUG),true)
 LOCAL_CFLAGS :=        \
        $(LOCAL_CFLAGS) \