6d5dd2367a
combo/TARGET_x86*.mk mistakenly added TARGET_GLOBAL_CFLAGS to their linker command lines. This results in clang builds not working properly, since they strip some unknown flags from TARGET_GLOBAL_CFLAGS. Change-Id: I60a1ff5df70305323134435e4ae107ea7acfe8ea
55 lines
2 KiB
Makefile
55 lines
2 KiB
Makefile
|
|
include $(BUILD_SYSTEM)/clang/x86.mk
|
|
|
|
CLANG_CONFIG_x86_TARGET_TRIPLE := i686-linux-android
|
|
# NOTE: There is no i686-linux-android prebuilt, so we must hardcode the
|
|
# x86_64 target instead.
|
|
CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX := \
|
|
$($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin
|
|
|
|
CLANG_CONFIG_x86_TARGET_EXTRA_ASFLAGS := \
|
|
$(CLANG_CONFIG_EXTRA_ASFLAGS) \
|
|
$(CLANG_CONFIG_TARGET_EXTRA_ASFLAGS) \
|
|
$(CLANG_CONFIG_x86_EXTRA_ASFLAGS) \
|
|
-target $(CLANG_CONFIG_x86_TARGET_TRIPLE) \
|
|
-B$(CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX)
|
|
|
|
CLANG_CONFIG_x86_TARGET_EXTRA_CFLAGS := \
|
|
$(CLANG_CONFIG_EXTRA_CFLAGS) \
|
|
$(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \
|
|
$(CLANG_CONFIG_x86_EXTRA_CFLAGS) \
|
|
$(CLANG_CONFIG_x86_TARGET_EXTRA_ASFLAGS)
|
|
|
|
CLANG_CONFIG_x86_TARGET_EXTRA_CPPFLAGS := \
|
|
$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
|
|
$(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \
|
|
$(CLANG_CONFIG_x86_EXTRA_CPPFLAGS) \
|
|
|
|
CLANG_CONFIG_x86_TARGET_EXTRA_LDFLAGS := \
|
|
$(CLANG_CONFIG_EXTRA_LDFLAGS) \
|
|
$(CLANG_CONFIG_TARGET_EXTRA_LDFLAGS) \
|
|
$(CLANG_CONFIG_x86_EXTRA_LDFLAGS) \
|
|
-target $(CLANG_CONFIG_x86_TARGET_TRIPLE) \
|
|
-B$(CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX)
|
|
|
|
|
|
define $(clang_2nd_arch_prefix)convert-to-clang-flags
|
|
$(strip \
|
|
$(call subst-clang-incompatible-x86-flags,\
|
|
$(filter-out $(CLANG_CONFIG_x86_UNKNOWN_CFLAGS),\
|
|
$(1))))
|
|
endef
|
|
|
|
$(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_CFLAGS := \
|
|
$(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS)) \
|
|
$(CLANG_CONFIG_x86_TARGET_EXTRA_CFLAGS)
|
|
|
|
$(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_CPPFLAGS := \
|
|
$(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_CPPFLAGS)) \
|
|
$(CLANG_CONFIG_x86_TARGET_EXTRA_CPPFLAGS)
|
|
|
|
$(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \
|
|
$(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS)) \
|
|
$(CLANG_CONFIG_x86_TARGET_EXTRA_LDFLAGS)
|
|
|
|
$(clang_2nd_arch_prefix)RS_TRIPLE := i686-unknown-linux
|