diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2023-01-10 08:44:05 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-10 08:44:05 -0300 |
commit | bd8ff87bf68f52b3933c5d1e9f83c610f18a963d (patch) | |
tree | ba42b0e2542a7766b5ab5c594aa0483896039c8b /recipes-security/optee-imx/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch | |
parent | 3ed75dc03f775584a91d76f05e2df09f517bf974 (diff) | |
parent | 10c68480697fadc7fbb76845497010ce26fd11de (diff) | |
download | meta-freescale-bd8ff87bf68f52b3933c5d1e9f83c610f18a963d.tar.gz |
Merge pull request #1379 from Freescale/backport-1373-to-kirkstone
[Backport kirkstone] optee-os: Fix build with clang
Diffstat (limited to 'recipes-security/optee-imx/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch')
-rw-r--r-- | recipes-security/optee-imx/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/recipes-security/optee-imx/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch b/recipes-security/optee-imx/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch new file mode 100644 index 00000000..c07d0482 --- /dev/null +++ b/recipes-security/optee-imx/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 528aeb42652a3159c1bfd51d6c1442c3ff27b84c Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Tue, 26 May 2020 14:38:02 -0500 | ||
4 | Subject: [PATCH] allow setting sysroot for libgcc lookup | ||
5 | |||
6 | Explicitly pass the new variable LIBGCC_LOCATE_CFLAGS variable when searching | ||
7 | for the compiler libraries as there's no easy way to reliably pass --sysroot | ||
8 | otherwise. | ||
9 | |||
10 | Upstream-Status: Pending [https://github.com/OP-TEE/optee_os/issues/4188] | ||
11 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
12 | |||
13 | --- | ||
14 | mk/gcc.mk | 6 +++--- | ||
15 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
16 | |||
17 | --- a/mk/gcc.mk | ||
18 | +++ b/mk/gcc.mk | ||
19 | @@ -13,11 +13,11 @@ nostdinc$(sm) := -nostdinc -isystem $(sh | ||
20 | -print-file-name=include 2> /dev/null) | ||
21 | |||
22 | # Get location of libgcc from gcc | ||
23 | -libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \ | ||
24 | +libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \ | ||
25 | -print-libgcc-file-name 2> /dev/null) | ||
26 | -libstdc++$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ | ||
27 | +libstdc++$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ | ||
28 | -print-file-name=libstdc++.a 2> /dev/null) | ||
29 | -libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ | ||
30 | +libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ | ||
31 | -print-file-name=libgcc_eh.a 2> /dev/null) | ||
32 | |||
33 | # Define these to something to discover accidental use | ||