diff options
| -rw-r--r-- | core/cortex-m/toolchain.mk | 3 | ||||
| -rw-r--r-- | core/host/toolchain.mk | 2 | ||||
| -rw-r--r-- | third_party/rules.mk | 15 |
3 files changed, 10 insertions, 10 deletions
diff --git a/core/cortex-m/toolchain.mk b/core/cortex-m/toolchain.mk index 55ca2d74cd..d52461bf3a 100644 --- a/core/cortex-m/toolchain.mk +++ b/core/cortex-m/toolchain.mk @@ -9,6 +9,9 @@ else # llvm sdk CROSS_COMPILE_ARM_DEFAULT:=armv7m-cros-eabi- endif +CMAKE_SYSTEM_PROCESSOR ?= armv7 +# TODO(b/275450331): Enable the asm after we fix the crash. +OPENSSL_NO_ASM ?= 1 $(call set-option,CROSS_COMPILE,\ $(CROSS_COMPILE_arm),\ diff --git a/core/host/toolchain.mk b/core/host/toolchain.mk index 168d0e24c2..9575559eb4 100644 --- a/core/host/toolchain.mk +++ b/core/host/toolchain.mk @@ -3,6 +3,8 @@ # found in the LICENSE file. CROSS_COMPILE_HOST_DEFAULT:=x86_64-pc-linux-gnu- +CMAKE_SYSTEM_PROCESSOR ?= x86_64 +OPENSSL_NO_ASM ?= 0 $(call set-option,CROSS_COMPILE,\ $(CROSS_COMPILE_host),\ diff --git a/third_party/rules.mk b/third_party/rules.mk index 065b8862d4..888ef41c06 100644 --- a/third_party/rules.mk +++ b/third_party/rules.mk @@ -30,16 +30,11 @@ CPPFLAGS += -I$(CRYPTOC_DIR)/include CRYPTOC_LDFLAGS := -L$(out)/cryptoc -lcryptoc ifeq ($(CONFIG_BORINGSSL_CRYPTO), y) - -ifeq ($(CROSS_COMPILE), armv7m-cros-eabi-) -CMAKE_SYSTEM_PROCESSOR ?= armv7 -# TODO(b/275450331): Enable the asm after we fix the crash. -OPENSSL_NO_ASM ?= 1 -else ifneq (,$(findstring x86_64, $(CROSS_COMPILE))) -CMAKE_SYSTEM_PROCESSOR ?= x86_64 -OPENSSL_NO_ASM ?= 0 -else -$(error ERROR: Unknown compiler: $(CROSS_COMPILE)) +ifndef CMAKE_SYSTEM_PROCESSOR +$(error ERROR: Set CMAKE_SYSTEM_PROCESSOR in core/$(CORE)/toolchain.mk) +endif +ifndef OPENSSL_NO_ASM +$(error ERROR: Set OPENSSL_NO_ASM in core/$(CORE)/toolchain.mk) endif BORINGSSL_OUTDIR := $(out)/third_party/boringssl/crypto |