| Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame^] | 1 | From 7f40f8321fb999e9b34d948724517d3fb0d26820 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 3 | Date: Thu, 28 Oct 2021 11:33:40 +0100 |
| Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame^] | 4 | Subject: [PATCH] Pass CXXFLAGS_FOR_BUILD in a couple of places to avoid these |
| 5 | errors. |
| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 6 | |
| Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame^] | 7 | If CXXFLAGS contains something unsupported by the build CXX, we see build failures (e.g. using -fmacro-prefix-map for the target). |
| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 8 | |
| 9 | 2021-10-28 Richard Purdie <richard.purdie@linuxfoundation.org> |
| 10 | |
| 11 | ChangeLog: |
| 12 | |
| 13 | * Makefile.in: Regenerate. |
| 14 | * Makefile.tpl: Add missing CXXFLAGS_FOR_BUILD overrides |
| 15 | |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame] | 16 | Upstream-Status: Pending [should be submittable] |
| 17 | |
| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 18 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame] | 19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 20 | --- |
| 21 | Makefile.in | 2 ++ |
| 22 | Makefile.tpl | 2 ++ |
| 23 | 2 files changed, 4 insertions(+) |
| 24 | |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame] | 25 | diff --git a/Makefile.in b/Makefile.in |
| Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame^] | 26 | index 593495e1650..1d9c83cc566 100644 |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame] | 27 | --- a/Makefile.in |
| 28 | +++ b/Makefile.in |
| 29 | @@ -176,6 +176,7 @@ BUILD_EXPORTS = \ |
| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 30 | # built for the build system to override those in BASE_FLAGS_TO_PASS. |
| 31 | EXTRA_BUILD_FLAGS = \ |
| 32 | CFLAGS="$(CFLAGS_FOR_BUILD)" \ |
| 33 | + CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \ |
| 34 | LDFLAGS="$(LDFLAGS_FOR_BUILD)" |
| 35 | |
| 36 | # This is the list of directories to built for the host system. |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame] | 37 | @@ -207,6 +208,7 @@ HOST_EXPORTS = \ |
| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 38 | CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ |
| 39 | CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ |
| 40 | CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ |
| 41 | + CXXFLAGS_FOR_BUILD="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS_FOR_BUILD; \ |
| 42 | DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \ |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame] | 43 | DSYMUTIL="$(DSYMUTIL)"; export DSYMUTIL; \ |
| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 44 | LD="$(LD)"; export LD; \ |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame] | 45 | diff --git a/Makefile.tpl b/Makefile.tpl |
| Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame^] | 46 | index ef58fac2b9a..bab04f335c2 100644 |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame] | 47 | --- a/Makefile.tpl |
| 48 | +++ b/Makefile.tpl |
| 49 | @@ -179,6 +179,7 @@ BUILD_EXPORTS = \ |
| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 50 | # built for the build system to override those in BASE_FLAGS_TO_PASS. |
| 51 | EXTRA_BUILD_FLAGS = \ |
| 52 | CFLAGS="$(CFLAGS_FOR_BUILD)" \ |
| 53 | + CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \ |
| 54 | LDFLAGS="$(LDFLAGS_FOR_BUILD)" |
| 55 | |
| 56 | # This is the list of directories to built for the host system. |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame] | 57 | @@ -210,6 +211,7 @@ HOST_EXPORTS = \ |
| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 58 | CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ |
| 59 | CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ |
| 60 | CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ |
| 61 | + CXXFLAGS_FOR_BUILD="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS_FOR_BUILD; \ |
| 62 | DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \ |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame] | 63 | DSYMUTIL="$(DSYMUTIL)"; export DSYMUTIL; \ |
| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 64 | LD="$(LD)"; export LD; \ |