| Message ID | 20210323163051.1284416-1-joerg.krause@embedded.rocks |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] package/pkg-meson.mk: fix setting host C++ compiler | expand |
On Tue, 23 Mar 2021 17:30:50 +0100 Jörg Krause <joerg.krause@embedded.rocks> wrote: > Commit f4a61d1ae23ec7729af3a8a165bbee45b6b9ef75 introduced CC_FOR_BUILD and > CXX_FOR_BUILD to avoid detecting ccache. > > Both values are set to `HOSTCC`. This causes issues where C++ files are > compiled with the C compiler without passing the `stdc++` flag to the > linker, too. > > Therefore, switch to pass the C++ compiler to CXX_FOR_BUILD. > > Correctly fixes: > http://autobuild.buildroot.org/results/871e1362c44e5b68a149e6a5dd3caf99ea0d904a > > Commit 9783c04aaf5e4fc94099772f1dc699a974ee6538 proposed a fix which in > fact is a workaround to get Meson to pass the `stdc++` flag to the C > linker. > > A fellow-up commit will revert this commit, as it is no longer > needed. > > Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> > --- > package/pkg-meson.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Thanks, both applied! Thomas
>>>>> "Jörg" == Jörg Krause <joerg.krause@embedded.rocks> writes: > Commit f4a61d1ae23ec7729af3a8a165bbee45b6b9ef75 introduced CC_FOR_BUILD and > CXX_FOR_BUILD to avoid detecting ccache. > Both values are set to `HOSTCC`. This causes issues where C++ files are > compiled with the C compiler without passing the `stdc++` flag to the > linker, too. > Therefore, switch to pass the C++ compiler to CXX_FOR_BUILD. > Correctly fixes: > http://autobuild.buildroot.org/results/871e1362c44e5b68a149e6a5dd3caf99ea0d904a > Commit 9783c04aaf5e4fc94099772f1dc699a974ee6538 proposed a fix which in > fact is a workaround to get Meson to pass the `stdc++` flag to the C > linker. > A fellow-up commit will revert this commit, as it is no longer > needed. > Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Committed to 2020.02.x, 2020.11.x and 2021.02.x, thanks.
diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index aafb441fae..a57820d4d2 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -83,7 +83,7 @@ define $(2)_CONFIGURE_CMDS > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf PATH=$$(BR_PATH) \ CC_FOR_BUILD="$$(HOSTCC)" \ - CXX_FOR_BUILD="$$(HOSTCC)" \ + CXX_FOR_BUILD="$$(HOSTCXX)" \ $$($$(PKG)_CONF_ENV) \ $$(MESON) \ --prefix=/usr \
Commit f4a61d1ae23ec7729af3a8a165bbee45b6b9ef75 introduced CC_FOR_BUILD and CXX_FOR_BUILD to avoid detecting ccache. Both values are set to `HOSTCC`. This causes issues where C++ files are compiled with the C compiler without passing the `stdc++` flag to the linker, too. Therefore, switch to pass the C++ compiler to CXX_FOR_BUILD. Correctly fixes: http://autobuild.buildroot.org/results/871e1362c44e5b68a149e6a5dd3caf99ea0d904a Commit 9783c04aaf5e4fc94099772f1dc699a974ee6538 proposed a fix which in fact is a workaround to get Meson to pass the `stdc++` flag to the C linker. A fellow-up commit will revert this commit, as it is no longer needed. Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> --- package/pkg-meson.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)