From 7701eaa5b258aaf38b4eed702ae279b8f4588788 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 17 May 2016 00:41:25 -0700 Subject: [PATCH] Remove redundant clang cppflags Cppflags always get added to cflags, so we don't need to duplicate clang cppflags extras that are already in the clang cflags extras Change-Id: Ic099f565f20fd993fc0713c033fbc5154373c98f --- core/clang/HOST_CROSS_x86.mk | 3 +-- core/clang/HOST_CROSS_x86_64.mk | 3 +-- core/clang/HOST_x86.mk | 3 +-- core/clang/HOST_x86_64.mk | 3 +-- core/clang/HOST_x86_common.mk | 4 ---- core/clang/TARGET_arm.mk | 3 +-- core/clang/config.mk | 2 +- 7 files changed, 6 insertions(+), 15 deletions(-) diff --git a/core/clang/HOST_CROSS_x86.mk b/core/clang/HOST_CROSS_x86.mk index b78a0743bb..c67825b668 100644 --- a/core/clang/HOST_CROSS_x86.mk +++ b/core/clang/HOST_CROSS_x86.mk @@ -27,8 +27,7 @@ CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CPPFLAGS := \ $(CLANG_CONFIG_EXTRA_CPPFLAGS) \ $(CLANG_CONFIG_HOST_CROSS_EXTRA_CPPFLAGS) \ $(CLANG_CONFIG_x86_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_CPPFLAGS) \ - -target $(CLANG_CONFIG_x86_HOST_CROSS_TRIPLE) + $(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_CPPFLAGS) CLANG_CONFIG_x86_HOST_CROSS_EXTRA_LDFLAGS := \ $(CLANG_CONFIG_EXTRA_LDFLAGS) \ diff --git a/core/clang/HOST_CROSS_x86_64.mk b/core/clang/HOST_CROSS_x86_64.mk index b6f2de9768..cdf49a9b0a 100644 --- a/core/clang/HOST_CROSS_x86_64.mk +++ b/core/clang/HOST_CROSS_x86_64.mk @@ -27,8 +27,7 @@ CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CPPFLAGS := \ $(CLANG_CONFIG_EXTRA_CPPFLAGS) \ $(CLANG_CONFIG_HOST_CROSS_EXTRA_CPPFLAGS) \ $(CLANG_CONFIG_x86_64_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_CPPFLAGS) \ - -target $(CLANG_CONFIG_x86_64_HOST_CROSS_TRIPLE) + $(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_CPPFLAGS) CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_LDFLAGS := \ $(CLANG_CONFIG_EXTRA_LDFLAGS) \ diff --git a/core/clang/HOST_x86.mk b/core/clang/HOST_x86.mk index 0ec64adbaf..a2015f13e3 100644 --- a/core/clang/HOST_x86.mk +++ b/core/clang/HOST_x86.mk @@ -41,8 +41,7 @@ CLANG_CONFIG_x86_HOST_EXTRA_CPPFLAGS := \ $(CLANG_CONFIG_EXTRA_CPPFLAGS) \ $(CLANG_CONFIG_HOST_EXTRA_CPPFLAGS) \ $(CLANG_CONFIG_x86_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CPPFLAGS) \ - -target $(CLANG_CONFIG_x86_HOST_TRIPLE) + $(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CPPFLAGS) CLANG_CONFIG_x86_HOST_EXTRA_LDFLAGS := \ $(CLANG_CONFIG_EXTRA_LDFLAGS) \ diff --git a/core/clang/HOST_x86_64.mk b/core/clang/HOST_x86_64.mk index d46cb67e43..b2f83f7573 100644 --- a/core/clang/HOST_x86_64.mk +++ b/core/clang/HOST_x86_64.mk @@ -41,8 +41,7 @@ CLANG_CONFIG_x86_64_HOST_EXTRA_CPPFLAGS := \ $(CLANG_CONFIG_EXTRA_CPPFLAGS) \ $(CLANG_CONFIG_HOST_EXTRA_CPPFLAGS) \ $(CLANG_CONFIG_x86_64_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CPPFLAGS) \ - -target $(CLANG_CONFIG_x86_64_HOST_TRIPLE) + $(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CPPFLAGS) CLANG_CONFIG_x86_64_HOST_EXTRA_LDFLAGS := \ $(CLANG_CONFIG_EXTRA_LDFLAGS) \ diff --git a/core/clang/HOST_x86_common.mk b/core/clang/HOST_x86_common.mk index 1344eae8bc..733329732f 100644 --- a/core/clang/HOST_x86_common.mk +++ b/core/clang/HOST_x86_common.mk @@ -23,8 +23,6 @@ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS += -fstack-protector-strong ifneq ($(strip $($(clang_2nd_arch_prefix)HOST_IS_64_BIT)),) CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \ - --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \ - --sysroot $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \ -isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8 \ -isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/x86_64-linux \ -isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/backward @@ -38,8 +36,6 @@ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \ -L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib64 else CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \ - --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \ - --sysroot $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \ -isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8 \ -isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/x86_64-linux/32 \ -isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/backward diff --git a/core/clang/TARGET_arm.mk b/core/clang/TARGET_arm.mk index 5c1bf6f806..906e677eac 100644 --- a/core/clang/TARGET_arm.mk +++ b/core/clang/TARGET_arm.mk @@ -27,8 +27,7 @@ CLANG_CONFIG_arm_TARGET_EXTRA_CONLYFLAGS := \ CLANG_CONFIG_arm_TARGET_EXTRA_CPPFLAGS := \ $(CLANG_CONFIG_EXTRA_CPPFLAGS) \ $(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \ - $(CLANG_CONFIG_arm_EXTRA_CPPFLAGS) \ - -target $(CLANG_CONFIG_arm_TARGET_TRIPLE) + $(CLANG_CONFIG_arm_EXTRA_CPPFLAGS) CLANG_CONFIG_arm_TARGET_EXTRA_LDFLAGS := \ $(CLANG_CONFIG_EXTRA_LDFLAGS) \ diff --git a/core/clang/config.mk b/core/clang/config.mk index 1584926322..7b4821a948 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -106,7 +106,7 @@ CLANG_CONFIG_HOST_CROSS_EXTRA_LDFLAGS := # Clang flags for all target rules CLANG_CONFIG_TARGET_EXTRA_ASFLAGS := CLANG_CONFIG_TARGET_EXTRA_CFLAGS := -nostdlibinc -CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS := -nostdlibinc +CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS := CLANG_CONFIG_TARGET_EXTRA_LDFLAGS := CLANG_DEFAULT_UB_CHECKS := \