Your Name
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
From f158e3af6633bd689a76d53be2c9c590c0385350 Mon Sep 17 00:00:00 2001
|
|
From: Brett Warren <brett.warren@arm.com>
|
|
Date: Wed, 23 Sep 2020 09:27:34 +0100
|
|
Subject: [PATCH] optee: enable clang support
|
|
|
|
When compiling with clang, the LIBGCC_LOCATE_CFLAG variable used
|
|
to provide a sysroot wasn't included, which results in not locating
|
|
compiler-rt. This is mitigated by including the variable as ammended.
|
|
|
|
Upstream-Status: Pending
|
|
ChangeId: 8ba69a4b2eb8ebaa047cb266c9aa6c2c3da45701
|
|
Signed-off-by: Brett Warren <brett.warren@arm.com>
|
|
---
|
|
mk/clang.mk | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/mk/clang.mk b/mk/clang.mk
|
|
index c141a3f2ed0b..7d067cc007fa 100644
|
|
--- a/mk/clang.mk
|
|
+++ b/mk/clang.mk
|
|
@@ -27,7 +27,7 @@ comp-cflags-warns-clang := -Wno-language-extension-token \
|
|
|
|
# Note, use the compiler runtime library (libclang_rt.builtins.*.a) instead of
|
|
# libgcc for clang
|
|
-libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \
|
|
+libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \
|
|
-rtlib=compiler-rt -print-libgcc-file-name 2> /dev/null)
|
|
|
|
# Core ASLR relies on the executable being ready to run from its preferred load
|