| From 843eb2ef918d5ae3d09de088110cb026ca25306b Mon Sep 17 00:00:00 2001 |
| From: Ross Burton <ross.burton@arm.com> |
| Date: Tue, 26 May 2020 14:38:02 -0500 |
| Subject: [PATCH] allow setting sysroot for libgcc lookup |
| |
| Explicitly pass the new variable LIBGCC_LOCATE_CFLAGS variable when searching |
| for the compiler libraries as there's no easy way to reliably pass --sysroot |
| otherwise. |
| |
| Upstream-Status: Pending [https://github.com/OP-TEE/optee_os/issues/4188] |
| Signed-off-by: Ross Burton <ross.burton@arm.com> |
| --- |
| mk/gcc.mk | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/mk/gcc.mk b/mk/gcc.mk |
| index adc77a24f25e..81bfa78ad8d7 100644 |
| --- a/mk/gcc.mk |
| +++ b/mk/gcc.mk |
| @@ -13,11 +13,11 @@ nostdinc$(sm) := -nostdinc -isystem $(shell $(CC$(sm)) \ |
| -print-file-name=include 2> /dev/null) |
| |
| # Get location of libgcc from gcc |
| -libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \ |
| +libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \ |
| -print-libgcc-file-name 2> /dev/null) |
| -libstdc++$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ |
| +libstdc++$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ |
| -print-file-name=libstdc++.a 2> /dev/null) |
| -libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ |
| +libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ |
| -print-file-name=libgcc_eh.a 2> /dev/null) |
| |
| # Define these to something to discover accidental use |