diff options
| author | Stephen Crane <cranes@google.com> | 2021-11-08 15:15:12 -0800 |
|---|---|---|
| committer | Stephen Crane <cranes@google.com> | 2021-11-08 15:15:12 -0800 |
| commit | 02e8e4645fa0b0d8a9d888ced4f2468d62ebfbc9 (patch) | |
| tree | 0187dd2b8c1ea84f56b22a5f8206fd79b6dc6689 /arch | |
| parent | c0eee07ded4d7c37ca40c9aaf418cb4f3449815c (diff) | |
| download | common-02e8e4645fa0b0d8a9d888ced4f2468d62ebfbc9.tar.gz | |
Remove GCC support
Removes all references to CLANGBUILD and requires that we build with
clang. We weren't using GCC and want to remove it from the prebuilt
tools.
Test: build.py
Bug: 204914889
Change-Id: I974b6199d2b362cee9324f478c1dbef752e924e0
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/toolchain.mk | 4 | ||||
| -rw-r--r-- | arch/arm64/toolchain.mk | 4 | ||||
| -rw-r--r-- | arch/x86/toolchain.mk | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/toolchain.mk b/arch/arm/toolchain.mk index d386731f..4be55806 100644 --- a/arch/arm/toolchain.mk +++ b/arch/arm/toolchain.mk @@ -37,8 +37,6 @@ else # ARM_WITHOUT_VFP_NEON = true ARCH_arm_COMPILEFLAGS += -mfloat-abi=soft endif # ARM_WITHOUT_VFP_NEON -ifeq ($(call TOBOOL,$(CLANGBUILD)),true) - CLANG_ARM_TARGET_SYS ?= linux CLANG_ARM_TARGET_ABI ?= gnu @@ -57,7 +55,5 @@ endif ARCH_arm_COMPILEFLAGS += -target arm-$(CLANG_ARM_TARGET_SYS)-$(CLANG_ARM_TARGET_ABI) \ --gcc-toolchain=$(CLANG_ARM_AS_DIR)/ -endif - # Set up custom Rust target to match clang target ARCH_arm_RUSTFLAGS := --target=$(LOCAL_DIR)/rust-target.json diff --git a/arch/arm64/toolchain.mk b/arch/arm64/toolchain.mk index c7436cd4..02a0cb82 100644 --- a/arch/arm64/toolchain.mk +++ b/arch/arm64/toolchain.mk @@ -17,8 +17,6 @@ ifeq (true,$(call TOBOOL,$(SCS_ENABLED))) ARCH_arm64_COMPILEFLAGS += -ffixed-x18 endif -ifeq ($(call TOBOOL,$(CLANGBUILD)),true) - CLANG_ARM64_TARGET_SYS ?= linux CLANG_ARM64_TARGET_ABI ?= gnu @@ -32,7 +30,5 @@ endif ARCH_arm64_COMPILEFLAGS += -target aarch64-$(CLANG_ARM64_TARGET_SYS)-$(CLANG_ARM64_TARGET_ABI) \ --gcc-toolchain=$(CLANG_ARM64_AS_DIR)/ -endif - # Set Rust target to match clang target ARCH_arm64_RUSTFLAGS := --target=$(LOCAL_DIR)/rust-target.json diff --git a/arch/x86/toolchain.mk b/arch/x86/toolchain.mk index 3014d1f6..02074105 100644 --- a/arch/x86/toolchain.mk +++ b/arch/x86/toolchain.mk @@ -19,8 +19,6 @@ ifndef ARCH_x86_64_TOOLCHAIN_PREFIX $(error Please run envsetup.sh to set ARCH_x86_64_TOOLCHAIN_PREFIX) endif -ifeq ($(call TOBOOL,$(CLANGBUILD)),true) - CLANG_X86_64_TARGET_SYS ?= linux CLANG_X86_64_TARGET_ABI ?= gnu @@ -35,7 +33,5 @@ ARCH_x86_COMPILEFLAGS += -target x86_64-$(CLANG_X86_64_TARGET_SYS)-$(CLANG_X86_6 --gcc-toolchain=$(CLANG_X86_64_AS_DIR)/ endif - -endif endif |