diff --git a/core/binary.mk b/core/binary.mk index 7bc37847ab..79197a7a33 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -198,10 +198,6 @@ else ifeq ($(USE_CLANG_PLATFORM_BUILD),true) endif endif -ifeq ($(strip $($(LOCAL_2ND_ARCH_VAR_PREFIX)WITHOUT_$(my_prefix)CLANG)),true) - my_clang := -endif - my_cpp_std_version := -std=gnu++14 ifdef LOCAL_SDK_VERSION # The NDK handles this itself. diff --git a/core/clang/config.mk b/core/clang/config.mk index 53230c179b..1226d86368 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -1,11 +1,5 @@ ## Clang configurations. -# WITHOUT_CLANG covers both HOST and TARGET -ifeq ($(WITHOUT_CLANG),true) -WITHOUT_TARGET_CLANG := true -WITHOUT_HOST_CLANG := true -endif - LLVM_PREBUILTS_VERSION := 3.6 LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/$(LLVM_PREBUILTS_VERSION)/bin LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib/clang/$(LLVM_PREBUILTS_VERSION)/lib/linux/