aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2015-09-04 19:34:31 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-09-04 19:34:31 +0000
commite7154be84a56008703b8d0705ca4bffd6bfd3c31 (patch)
tree4f53344d9daf3db11243f6dce6b50a0e7deb98a6
parent05c10489f02137c99b9e927fe2d5a7165e94dc39 (diff)
parentf1f1bc38c2ef56b0fd16fddd4c202453dd9d8120 (diff)
downloadclang-e7154be84a56008703b8d0705ca4bffd6bfd3c31.tar.gz
Merge "Remove last HOST_OS check"
-rw-r--r--shared_clang.mk7
1 files changed, 1 insertions, 6 deletions
diff --git a/shared_clang.mk b/shared_clang.mk
index 8b81d168d3..2580e07626 100644
--- a/shared_clang.mk
+++ b/shared_clang.mk
@@ -46,16 +46,11 @@ include $(CLANG_HOST_BUILD_MK)
# have prebuilts for windows.
ifneq (true,$(FORCE_BUILD_LLVM_COMPONENTS))
LOCAL_MODULE_HOST_OS := windows
-# BUILD_HOST_SHARED_LIBRARY can be moved out once
-# LOCAL_MODULE_HOST_OS is enforced.
-ifeq ($(HOST_OS),windows)
-include $(BUILD_HOST_SHARED_LIBRARY)
-endif
else
LOCAL_MODULE_HOST_OS := darwin linux windows
-include $(BUILD_HOST_SHARED_LIBRARY)
endif
+include $(BUILD_HOST_SHARED_LIBRARY)
# Don't build the library unless forced to.
ifeq (true,$(FORCE_BUILD_LLVM_COMPONENTS))