Skip to content

Commit

Permalink
ANDROID: arch/Kconfig: fix up LTO LLVM_IAS depdency
Browse files Browse the repository at this point in the history
Due to LTO being backported to android's 5.10 branches first, the
backport of ba64beb dropped this. Now
that we have backports for checking AS_IS_LLVM, use that so that we
don't accidentally prevent LTO from being selectable.

Bug: 1938905
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Change-Id: I93fe13dba285bbb9fa1ae0e111bd2955c0b87c12
  • Loading branch information
nickdesaulniers committed Jan 25, 2022
1 parent ffff118 commit e48efff
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions arch/Kconfig
Expand Up @@ -642,8 +642,7 @@ config ARCH_SUPPORTS_LTO_CLANG_THIN
config HAS_LTO_CLANG
def_bool y
# Clang >= 11: https://github.com/ClangBuiltLinux/linux/issues/510
depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD
depends on $(success,test $(LLVM_IAS) -eq 1)
depends on CC_IS_CLANG && CLANG_VERSION >= 110000 && LD_IS_LLD && AS_IS_LLVM
depends on $(success,$(NM) --help | head -n 1 | grep -qi llvm)
depends on $(success,$(AR) --help | head -n 1 | grep -qi llvm)
depends on ARCH_SUPPORTS_LTO_CLANG
Expand Down

0 comments on commit e48efff

Please sign in to comment.