summaryrefslogtreecommitdiffstats
path: root/core/clang/TARGET_x86.mk
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-11-26 00:53:46 -0800
committerStephen Hines <srhines@google.com>2014-12-01 15:36:26 -0800
commit1568029218b3da82a3bbd3fd6dce4385db5daf5b (patch)
treec9218e1615019c199ce561fb102eb91144055fb7 /core/clang/TARGET_x86.mk
parent7dcbc563f8811259809b754d0c0edc717e1476e6 (diff)
downloadbuild-1568029218b3da82a3bbd3fd6dce4385db5daf5b.zip
build-1568029218b3da82a3bbd3fd6dce4385db5daf5b.tar.gz
build-1568029218b3da82a3bbd3fd6dce4385db5daf5b.tar.bz2
Add more support for GLOBAL_CONLYFLAGS.
This will be necessary to support -std=gnu99 mode for clang 3.6, which defaults to C11 mode (unlike prior releases that use C99). Change-Id: Iea84582f9f12ba76b988463cbc0a20bd61042538
Diffstat (limited to 'core/clang/TARGET_x86.mk')
-rw-r--r--core/clang/TARGET_x86.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/clang/TARGET_x86.mk b/core/clang/TARGET_x86.mk
index 60ee06f..507b4e4 100644
--- a/core/clang/TARGET_x86.mk
+++ b/core/clang/TARGET_x86.mk
@@ -20,6 +20,11 @@ CLANG_CONFIG_x86_TARGET_EXTRA_CFLAGS := \
$(CLANG_CONFIG_x86_EXTRA_CFLAGS) \
$(CLANG_CONFIG_x86_TARGET_EXTRA_ASFLAGS)
+CLANG_CONFIG_x86_TARGET_EXTRA_CONLYFLAGS := \
+ $(CLANG_CONFIG_EXTRA_CONLYFLAGS) \
+ $(CLANG_CONFIG_TARGET_EXTRA_CONLYFLAGS) \
+ $(CLANG_CONFIG_x86_EXTRA_CONLYFLAGS)
+
CLANG_CONFIG_x86_TARGET_EXTRA_CPPFLAGS := \
$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
$(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \
@@ -44,6 +49,10 @@ $(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_CONLYFLAGS := \
+ $(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_CONLYFLAGS)) \
+ $(CLANG_CONFIG_x86_TARGET_EXTRA_CONLYFLAGS)
+
$(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)