aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-04-04 10:45:06 -0400
committerJack Lloyd <[email protected]>2017-04-04 10:45:06 -0400
commit49cafc47a6b48c4b10bf57091ca9cd060011d67f (patch)
treeeb9ab5a733ccf4c4a2b838740f98a079fee0bc8a
parent6376cbfb5aa3859d36ed587aac468ebd68cd751a (diff)
Fix configuration on platforms without shared objects.
Was calling on a None object and failing, noticed by MinGW cross build.
-rwxr-xr-xconfigure.py39
1 files changed, 23 insertions, 16 deletions
diff --git a/configure.py b/configure.py
index 528f121ab..e5fc11e61 100755
--- a/configure.py
+++ b/configure.py
@@ -1716,22 +1716,6 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
'static_suffix': osinfo.static_suffix,
- 'soname_base': osinfo.soname_pattern_base.format(
- version_major=Version.major,
- version_minor=Version.minor,
- version_patch=Version.patch,
- abi_rev=Version.so_rev),
- 'soname_abi': osinfo.soname_pattern_abi.format(
- version_major=Version.major,
- version_minor=Version.minor,
- version_patch=Version.patch,
- abi_rev=Version.so_rev),
- 'soname_patch': osinfo.soname_pattern_patch.format(
- version_major=Version.major,
- version_minor=Version.minor,
- version_patch=Version.patch,
- abi_rev=Version.so_rev),
-
'mod_list': '\n'.join(sorted([m.basename for m in modules])),
'python_version': options.python_version,
@@ -1740,6 +1724,29 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
'misc_config': make_cpp_macros(misc_config())
}
+ if options.build_shared_lib:
+
+ if osinfo.soname_pattern_base != None:
+ variables['soname_base'] = osinfo.soname_pattern_base.format(
+ version_major=Version.major,
+ version_minor=Version.minor,
+ version_patch=Version.patch,
+ abi_rev=Version.so_rev)
+
+ if osinfo.soname_pattern_abi != None:
+ variables['soname_abi'] = osinfo.soname_pattern_abi.format(
+ version_major=Version.major,
+ version_minor=Version.minor,
+ version_patch=Version.patch,
+ abi_rev=Version.so_rev)
+
+ if osinfo.soname_pattern_patch != None:
+ variables['soname_patch'] = osinfo.soname_pattern_patch.format(
+ version_major=Version.major,
+ version_minor=Version.minor,
+ version_patch=Version.patch,
+ abi_rev=Version.so_rev)
+
if options.os == 'darwin' and options.build_shared_lib:
# In order that these executables work from the build directory,
# we need to change the install names