summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--numpy/distutils/command/config.py2
-rw-r--r--numpy/distutils/mingw32ccompiler.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py
index 9cc457ce5..5cbebe312 100644
--- a/numpy/distutils/command/config.py
+++ b/numpy/distutils/command/config.py
@@ -13,7 +13,7 @@ from distutils.file_util import copy_file
from distutils.msvccompiler import get_build_version as get_build_msvc_version
from numpy.distutils.exec_command import exec_command
from numpy.distutils.mingw32ccompiler import msvc_manifest_xml, \
- check_embedded_msvcr_match_linked, manifest_name, rc_name
+ check_embedded_msvcr_match_linked, manifest_name, rc_name, manifest_rc
LANG_EXT['f77'] = '.f'
LANG_EXT['f90'] = '.f90'
diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py
index 2633064cf..17711360b 100644
--- a/numpy/distutils/mingw32ccompiler.py
+++ b/numpy/distutils/mingw32ccompiler.py
@@ -308,14 +308,14 @@ def check_embedded_msvcr_match_linked(msver):
"(%d)" % (int(msver), maj)
def configtest_name(config):
- base = os.path.basename(config._gen_temp_sourcefile("yo", [], lang))
+ base = os.path.basename(config._gen_temp_sourcefile("yo", [], "c"))
return os.path.splitext(base)[0]
def manifest_name(config):
# Get configest name (including suffix)
root = configtest_name(config)
- exext = self.compiler.exe_extension
- return root + exect + ".manifest"
+ exext = config.compiler.exe_extension
+ return root + exext + ".manifest"
def rc_name(config):
# Get configest name (including suffix)