StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not assume CLANG is used when custom toolchain is provided"

Browse Source
This commit is contained in:
Alexey Polyudov
2016-08-02 22:03:37 +00:00
committed by Gerrit Code Review
parent ce5900a6e0 7d6b3f1595
commit 7a16eb05cc
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/binary.mk
View File

@@ -268,6 +268,13 @@ ifdef LOCAL_CLANG_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)
my_clang := $(strip $(LOCAL_CLANG_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)))
endif
# if custom toolchain is in use, default is not to use clang, if not explicitly required
ifneq ($(my_cc)$(my_cxx),)
ifeq ($(my_clang),)
my_clang := false
endif
endif
# clang is enabled by default for host builds
# enable it unless we've specifically disabled clang above
ifdef LOCAL_IS_HOST_MODULE