Fix Windows SDK build to not use clang.

bug 16172793

Change-Id: I7bf76cae49ec17bf50eb657b0e38234b7cb55e85
This commit is contained in:
Tim Murray 2014-07-24 14:42:53 -07:00
parent f82de5b89d
commit 5ca1dc15a1
1 changed files with 5 additions and 3 deletions

View File

@ -133,10 +133,12 @@ endif
# clang is enabled by default for host builds # clang is enabled by default for host builds
# enable it unless we've specifically disabled clang above # enable it unless we've specifically disabled clang above
ifdef LOCAL_IS_HOST_MODULE ifdef LOCAL_IS_HOST_MODULE
ifneq($(HOST_OS),windows)
ifeq ($(my_clang),) ifeq ($(my_clang),)
my_clang := true my_clang := true
endif endif
endif endif
endif
# arch-specific static libraries go first so that generic ones can depend on them # arch-specific static libraries go first so that generic ones can depend on them
my_static_libraries := $(LOCAL_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_static_libraries) my_static_libraries := $(LOCAL_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_static_libraries)