Merge "Adding gcc-specific disable of Wattributes in preparation for libcxx rebase."

am: 7984620

* commit '798462046192ede9e723672016da5f7aa17fc988':
  Adding gcc-specific disable of Wattributes in preparation for libcxx rebase.

Change-Id: Ie67479e1157d97f5b42f42b086bdaf31d738e398
This commit is contained in:
Dan Austin
2016-04-18 18:35:09 +00:00
committed by android-build-merger

View File

@@ -1338,6 +1338,10 @@ my_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags
my_cppflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_cppflags))
my_asflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_asflags))
my_ldflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(my_ldflags))
else
# gcc does not handle hidden functions in a manner compatible with LLVM libcxx
# see b/27908145
my_cflags += -Wno-attributes
endif
ifeq ($(my_fdo_build), true)