Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bbed5a6 authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Remove redundant clang cppflags"

parents f0a465c2 7701eaa5

core/clang/HOST_CROSS_x86.mk

+1 −2
Original line number Diff line number Diff line
@@ -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) \

core/clang/HOST_CROSS_x86_64.mk

+1 −2
Original line number Diff line number Diff line
@@ -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) \

core/clang/HOST_x86.mk

+1 −2
Original line number Diff line number Diff line
@@ -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) \

core/clang/HOST_x86_64.mk

+1 −2
Original line number Diff line number Diff line
@@ -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) \

core/clang/HOST_x86_common.mk

+0 −4
Original line number Diff line number Diff line
@@ -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