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

Commit 056609cc authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Remove unnecessary variables 

These are all either recently unused due to the removal of CFLAGS/etc,
or have been exported by Soong and are no longer necessary.

Change-Id: I5930d43fda21acc8202b3d8ea010fbefb6ae4cf1
parent 576fd3eb

core/clang/HOST_CROSS_x86.mk

+0 −38
Original line number Diff line number Diff line 


include $(BUILD_SYSTEM)/clang/x86.mk



CLANG_CONFIG_x86_HOST_CROSS_TRIPLE := i686-pc-mingw32



CLANG_CONFIG_x86_HOST_CROSS_EXTRA_ASFLAGS := \

  $(CLANG_CONFIG_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_HOST_CROSS_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_x86_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_ASFLAGS) \

  -target $(CLANG_CONFIG_x86_HOST_CROSS_TRIPLE)



CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CFLAGS := \

  $(CLANG_CONFIG_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_HOST_CROSS_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_HOST_CROSS_EXTRA_ASFLAGS)



CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CONLYFLAGS := \

  $(CLANG_CONFIG_EXTRA_CONLYFLAGS) \

  $(CLANG_CONFIG_HOST_CROSS_EXTRA_CONLYFLAGS) \

  $(CLANG_CONFIG_x86_EXTRA_CONLYFLAGS) \

  $(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_CONLYFLAGS)



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)



CLANG_CONFIG_x86_HOST_CROSS_EXTRA_LDFLAGS := \

  $(CLANG_CONFIG_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_HOST_CROSS_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_x86_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_LDFLAGS) \

  -target $(CLANG_CONFIG_x86_HOST_CROSS_TRIPLE)



$(clang_2nd_arch_prefix)HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686.a

core/clang/HOST_CROSS_x86_64.mk

+0 −38
Original line number Diff line number Diff line 


include $(BUILD_SYSTEM)/clang/x86_64.mk



CLANG_CONFIG_x86_64_HOST_CROSS_TRIPLE := x86_64-pc-mingw32



CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_ASFLAGS := \

  $(CLANG_CONFIG_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_HOST_CROSS_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_x86_64_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_ASFLAGS) \

  -target $(CLANG_CONFIG_x86_64_HOST_CROSS_TRIPLE)



CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CFLAGS := \

  $(CLANG_CONFIG_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_HOST_CROSS_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_64_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_ASFLAGS)



CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CONLYFLAGS := \

  $(CLANG_CONFIG_EXTRA_CONLYFLAGS) \

  $(CLANG_CONFIG_HOST_CROSS_EXTRA_CONLYFLAGS) \

  $(CLANG_CONFIG_x86_64_EXTRA_CONLYFLAGS) \

  $(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_CONLYFLAGS)



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)



CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_LDFLAGS := \

  $(CLANG_CONFIG_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_HOST_CROSS_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_x86_64_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_LDFLAGS) \

  -target $(CLANG_CONFIG_x86_64_HOST_CROSS_TRIPLE)



$(clang_2nd_arch_prefix)HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-x86_64.a

core/clang/HOST_x86.mk

+0 −52
Original line number Diff line number Diff line 


include $(BUILD_SYSTEM)/clang/x86.mk

include $(BUILD_SYSTEM)/clang/HOST_x86_common.mk



ifeq ($(HOST_OS),linux)

CLANG_CONFIG_x86_HOST_TRIPLE := i686-linux-gnu

CLANG_CONFIG_x86_HOST_COMBO_EXTRA_ASFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS)

CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS)

CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CPPFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS)

CLANG_CONFIG_x86_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS)

endif

ifeq ($(HOST_OS),darwin)

CLANG_CONFIG_x86_HOST_TRIPLE := i686-apple-darwin

CLANG_CONFIG_x86_HOST_COMBO_EXTRA_ASFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_ASFLAGS)

CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CFLAGS)

CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CPPFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CPPFLAGS)

CLANG_CONFIG_x86_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_LDFLAGS)

endif



CLANG_CONFIG_x86_HOST_EXTRA_ASFLAGS := \

  $(CLANG_CONFIG_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_HOST_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_x86_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_ASFLAGS) \

  -target $(CLANG_CONFIG_x86_HOST_TRIPLE)



CLANG_CONFIG_x86_HOST_EXTRA_CFLAGS := \

  $(CLANG_CONFIG_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_HOST_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_HOST_EXTRA_ASFLAGS)



CLANG_CONFIG_x86_HOST_EXTRA_CONLYFLAGS := \

  $(CLANG_CONFIG_EXTRA_CONLYFLAGS) \

  $(CLANG_CONFIG_HOST_EXTRA_CONLYFLAGS) \

  $(CLANG_CONFIG_x86_EXTRA_CONLYFLAGS) \

  $(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CONLYFLAGS)



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)



CLANG_CONFIG_x86_HOST_EXTRA_LDFLAGS := \

  $(CLANG_CONFIG_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_HOST_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_x86_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_LDFLAGS) \

  -target $(CLANG_CONFIG_x86_HOST_TRIPLE)



$(clang_2nd_arch_prefix)HOST_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686.a

core/clang/HOST_x86_64.mk

+0 −52
Original line number Diff line number Diff line 


include $(BUILD_SYSTEM)/clang/x86_64.mk

include $(BUILD_SYSTEM)/clang/HOST_x86_common.mk



ifeq ($(HOST_OS),linux)

CLANG_CONFIG_x86_64_HOST_TRIPLE := x86_64-linux-gnu

CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_ASFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS)

CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS)

CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CPPFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS)

CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS)

endif

ifeq ($(HOST_OS),darwin)

CLANG_CONFIG_x86_64_HOST_TRIPLE := x86_64-apple-darwin

CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_ASFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_ASFLAGS)

CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CFLAGS)

CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CPPFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CPPFLAGS)

CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_LDFLAGS)

endif



CLANG_CONFIG_x86_64_HOST_EXTRA_ASFLAGS := \

  $(CLANG_CONFIG_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_HOST_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_x86_64_EXTRA_ASFLAGS) \

  $(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_ASFLAGS) \

  -target $(CLANG_CONFIG_x86_64_HOST_TRIPLE)



CLANG_CONFIG_x86_64_HOST_EXTRA_CFLAGS := \

  $(CLANG_CONFIG_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_HOST_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_64_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CFLAGS) \

  $(CLANG_CONFIG_x86_64_HOST_EXTRA_ASFLAGS)



CLANG_CONFIG_x86_64_HOST_EXTRA_CONLYFLAGS := \

  $(CLANG_CONFIG_EXTRA_CONLYFLAGS) \

  $(CLANG_CONFIG_HOST_EXTRA_CONLYFLAGS) \

  $(CLANG_CONFIG_x86_64_EXTRA_CONLYFLAGS) \

  $(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CONLYFLAGS)



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)



CLANG_CONFIG_x86_64_HOST_EXTRA_LDFLAGS := \

  $(CLANG_CONFIG_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_HOST_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_x86_64_EXTRA_LDFLAGS) \

  $(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_LDFLAGS) \

  -target $(CLANG_CONFIG_x86_64_HOST_TRIPLE)



HOST_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-x86_64.a

core/clang/HOST_x86_common.mk

deleted100644 → 0
+0 −51
Original line number Diff line number Diff line 
# Shared by HOST_x86.mk and HOST_x86_64.mk.



ifeq ($(HOST_OS),darwin)

CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_ASFLAGS := \

  -integrated-as



CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CFLAGS := \

  -integrated-as



CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CFLAGS += -fstack-protector-strong

endif



ifeq ($(HOST_OS),linux)

CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \

  --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \

  --sysroot $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \

  -B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin



CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \

  --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)



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 := \

  -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



CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \

  --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \

  --sysroot $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \

  -B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \

  -B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.8 \

  -L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.8 \

  -L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib64

else

CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \

  -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



CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \

  --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \

  --sysroot $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \

  -B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \

  -B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.8/32 \

  -L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.8/32 \

  -L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib32

endif

endif  # Linux