| Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 1 | From 528aeb42652a3159c1bfd51d6c1442c3ff27b84c Mon Sep 17 00:00:00 2001 |
| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 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> |
| Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 12 | |
| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 13 | --- |
| 14 | mk/gcc.mk | 6 +++--- |
| 15 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 16 | |
| 17 | diff --git a/mk/gcc.mk b/mk/gcc.mk |
| 18 | index adc77a24..81bfa78a 100644 |
| 19 | --- a/mk/gcc.mk |
| 20 | +++ b/mk/gcc.mk |
| 21 | @@ -13,11 +13,11 @@ nostdinc$(sm) := -nostdinc -isystem $(shell $(CC$(sm)) \ |
| 22 | -print-file-name=include 2> /dev/null) |
| 23 | |
| 24 | # Get location of libgcc from gcc |
| 25 | -libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \ |
| 26 | +libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \ |
| 27 | -print-libgcc-file-name 2> /dev/null) |
| 28 | -libstdc++$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ |
| 29 | +libstdc++$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ |
| 30 | -print-file-name=libstdc++.a 2> /dev/null) |
| 31 | -libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ |
| 32 | +libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ |
| 33 | -print-file-name=libgcc_eh.a 2> /dev/null) |
| 34 | |
| 35 | # Define these to something to discover accidental use |