diff options
author | Eli Schwartz <eschwartz@archlinux.org> | 2021-10-31 17:14:18 -0400 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-11-01 00:46:51 +0200 |
commit | f36c01ede9afa1492f96562e4f9be6b261966225 (patch) | |
tree | a7819686c6d152fad9d101dfb7a48121e5435e6f | |
parent | 04ae1cfb7999e25f476f84572ff0ad853629346c (diff) | |
download | meson-f36c01ede9afa1492f96562e4f9be6b261966225.zip meson-f36c01ede9afa1492f96562e4f9be6b261966225.tar.gz meson-f36c01ede9afa1492f96562e4f9be6b261966225.tar.bz2 |
Revert "known Python 3.5 on windows workaround for subprocess(cwd=str(Path))"
This reverts commit c89aa2094170b2ffd7151187c1c092db2a178f44.
We no longer support 3.5 so this can go.
-rw-r--r-- | mesonbuild/compilers/fortran.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py index 264c035..6a4a343 100644 --- a/mesonbuild/compilers/fortran.py +++ b/mesonbuild/compilers/fortran.py @@ -82,9 +82,8 @@ class FortranCompiler(CLikeCompiler, Compiler): # cwd=work_dir is necessary on Windows especially for Intel compilers to avoid error: cannot write on sanitycheckf.obj # this is a defect with how Windows handles files and ifort's object file-writing behavior vis concurrent ProcessPoolExecutor. # This simple workaround solves the issue. - # FIXME: cwd=str(work_dir) is for Python 3.5 on Windows, when 3.5 is deprcated, this can become cwd=work_dir returncode = subprocess.run(self.exelist + extra_flags + [str(source_name), '-o', str(binary_name)], - cwd=str(work_dir)).returncode + cwd=work_dir).returncode if returncode != 0: raise EnvironmentException('Compiler %s can not compile programs.' % self.name_string()) if self.is_cross: |