Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: amaranth-lang/amaranth
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 97aa7a3aa9c9
Choose a base ref
...
head repository: amaranth-lang/amaranth
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8081df1265c3
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 5, 2021

  1. _toolchain.cxx: use distutils from setuptools. 

    The distutils module from the standard library is deprecated and will
be removed in Python 3.12, and PEP 632 recommends using
distutils.ccompiler from setuptools, instead.

This code should eventually be rewritten to use zig-pypi, but for now
this suffices.
    @whitequark
    whitequark committed Nov 5, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    nickvergessen Joas Schilling
    GPG key ID: 74434EFE0D2E2205
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8081df1 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nmigen/_toolchain/cxx.py
4 changes: 2 additions & 2 deletions nmigen/_toolchain/cxx.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import tempfile
import sysconfig
import os.path
from distutils import ccompiler
from setuptools import distutils


__all__ = ["build_cxx"]
@@ -17,7 +17,7 @@ def build_cxx(*, cxx_sources, output_name, include_dirs, macros):
# the output directory directly.
os.chdir(build_dir.name)

cc_driver = ccompiler.new_compiler()
cc_driver = distutils.ccompiler.new_compiler()
cc_driver.output_dir = "."

cc = sysconfig.get_config_var("CC")