usb-tools/amaranth
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

_toolchain: Properly set compiler/linker executables on Gentoo

Browse source 
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>
This commit is contained in:
Adam Jeliński 2021-09-21 10:33:26 +02:00 committed by whitequark
parent 23a44f3cb6
commit da8a492be7
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nmigen/_toolchain/cxx.py
View file

@ -36,6 +36,16 @@ def build_cxx(*, cxx_sources, output_name, include_dirs, macros):
linker_so=ld_cxxflags, 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: for include_dir in include_dirs:
cc_driver.add_include_dir(include_dir) cc_driver.add_include_dir(include_dir)
for macro in macros: for macro in macros: