| From 2a1336d2e2ba08747acd7368264fc5813a37b049 Mon Sep 17 00:00:00 2001 |
| From: Richard Purdie <richard.purdie@linuxfoundation.org> |
| Date: Thu, 28 Oct 2021 11:33:40 +0100 |
| Subject: [PATCH] Pass CXXFLAGS_FOR_BUILD in a couple of places to avoid these |
| errors. |
| |
| If CXXFLAGS contains something unsupported by the build CXX, we see build failures (e.g. using -fmacro-prefix-map for the target). |
| |
| 2021-10-28 Richard Purdie <richard.purdie@linuxfoundation.org> |
| |
| ChangeLog: |
| |
| * Makefile.in: Regenerate. |
| * Makefile.tpl: Add missing CXXFLAGS_FOR_BUILD overrides |
| |
| Upstream-Status: Pending [should be submittable] |
| |
| Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| Makefile.in | 2 ++ |
| Makefile.tpl | 2 ++ |
| 2 files changed, 4 insertions(+) |
| |
| diff --git a/Makefile.in b/Makefile.in |
| index 06a9398e172..4b0069b257c 100644 |
| --- a/Makefile.in |
| +++ b/Makefile.in |
| @@ -178,6 +178,7 @@ BUILD_EXPORTS = \ |
| # built for the build system to override those in BASE_FLAGS_TO_PASS. |
| EXTRA_BUILD_FLAGS = \ |
| CFLAGS="$(CFLAGS_FOR_BUILD)" \ |
| + CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \ |
| LDFLAGS="$(LDFLAGS_FOR_BUILD)" |
| |
| # This is the list of directories to built for the host system. |
| @@ -210,6 +211,7 @@ HOST_EXPORTS = \ |
| CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ |
| CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ |
| CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ |
| + CXXFLAGS_FOR_BUILD="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS_FOR_BUILD; \ |
| DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \ |
| DSYMUTIL="$(DSYMUTIL)"; export DSYMUTIL; \ |
| LD="$(LD)"; export LD; \ |
| diff --git a/Makefile.tpl b/Makefile.tpl |
| index dfbd74b68f8..419b332953b 100644 |
| --- a/Makefile.tpl |
| +++ b/Makefile.tpl |
| @@ -181,6 +181,7 @@ BUILD_EXPORTS = \ |
| # built for the build system to override those in BASE_FLAGS_TO_PASS. |
| EXTRA_BUILD_FLAGS = \ |
| CFLAGS="$(CFLAGS_FOR_BUILD)" \ |
| + CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \ |
| LDFLAGS="$(LDFLAGS_FOR_BUILD)" |
| |
| # This is the list of directories to built for the host system. |
| @@ -213,6 +214,7 @@ HOST_EXPORTS = \ |
| CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ |
| CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ |
| CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ |
| + CXXFLAGS_FOR_BUILD="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS_FOR_BUILD; \ |
| DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \ |
| DSYMUTIL="$(DSYMUTIL)"; export DSYMUTIL; \ |
| LD="$(LD)"; export LD; \ |