From: Adam Jeliński <ajelinski@antmicro.com>
Date: Tue, 21 Sep 2021 08:33:26 +0000 (+0200)
Subject: _toolchain: Properly set compiler/linker executables on Gentoo
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=103aff925dc5fa3ecc046d46d31061fc65c7fb8a;p=nmigen.git

_toolchain: Properly set compiler/linker executables on Gentoo

The `test_toolchain_cxx.py` tests on Gentoo definitely use compiler and
linker set with `_so_cxx`-suffixed executables. Tests use a proper
executable instead of `c++` after this change.

Signed-off-by: Adam Jeliński <ajelinski@antmicro.com>
---

diff --git a/nmigen/_toolchain/cxx.py b/nmigen/_toolchain/cxx.py
index 107cdab..9b7fce2 100644
--- a/nmigen/_toolchain/cxx.py
+++ b/nmigen/_toolchain/cxx.py
@@ -36,6 +36,16 @@ def build_cxx(*, cxx_sources, output_name, include_dirs, macros):
             linker_so=ld_cxxflags,
         )
 
+        # Sometimes CCompiler is modified to have additional executable entries for compiling and
+        # linking CXX shared objects (e.g. on Gentoo). These executables have to be set then.
+        try:
+            cc_driver.set_executables(
+                compiler_so_cxx=f"{cxx} {cflags}",
+                linker_so_cxx=ld_cxxflags,
+            )
+        except:
+            pass
+
         for include_dir in include_dirs:
             cc_driver.add_include_dir(include_dir)
         for macro in macros: