diff options
author | Jeremy Bettis <jbettis@google.com> | 2023-04-25 16:59:47 -0600 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-04-26 00:20:20 +0000 |
commit | 60f8aece2b85205591a12c6abdb7faa9443943de (patch) | |
tree | b094bbadc5a9f4b1f149575c239abca7fc2026e9 /core | |
parent | 58d8fc6c170c69beb3d081d9e1f5bafb3dffe83d (diff) | |
download | chrome-ec-60f8aece2b85205591a12c6abdb7faa9443943de.tar.gz |
boringssl: Move flags to toolchain.mk
Instead of comparing the CROS_COMPILE path to magic strings, just set
the arch specific flags CMAKE_SYSTEM_PROCESSOR and OPENSSL_NO_ASM in
core/$(CORE)/toolchain.mk
This also has the advantage of working when CROSS_COMPILE is set to
something odd, not in the chroot, like in gitlab builds.
BRANCH=None
BUG=b:248508087, b:273639386
TEST=make buildall
Change-Id: I0c823e321892a04e1f063d8fa0ce386428f5dc6c
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4477525
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Auto-Submit: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Yi Chou <yich@google.com>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Yi Chou <yich@google.com>
Diffstat (limited to 'core')
-rw-r--r-- | core/cortex-m/toolchain.mk | 3 | ||||
-rw-r--r-- | core/host/toolchain.mk | 2 |
2 files changed, 5 insertions, 0 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),\ |