aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2018-09-04 19:40:07 -0400
committerJack Lloyd <[email protected]>2018-09-04 19:40:07 -0400
commitbd523b1a08f9e9b7316b3613a5a589471c7785d4 (patch)
tree65fa0dee30723689cb5354b02d8c82efad5b135d
parentf9df6c667b093326b5dc5adea8bcb215445652f9 (diff)
When rejecting modules, filter first by CPU requirements
-rwxr-xr-xconfigure.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.py b/configure.py
index 1025835e5..7b18f80d0 100755
--- a/configure.py
+++ b/configure.py
@@ -2041,15 +2041,15 @@ class ModulesChooser(object):
self._modules, self._options.enabled_modules, self._options.disabled_modules)
def _check_usable(self, module, modname):
- if not module.compatible_os(self._osinfo, self._options):
+ if not module.compatible_cpu(self._archinfo, self._options):
+ self._not_using_because['incompatible CPU'].add(modname)
+ return False
+ elif not module.compatible_os(self._osinfo, self._options):
self._not_using_because['incompatible OS'].add(modname)
return False
elif not module.compatible_compiler(self._ccinfo, self._cc_min_version, self._archinfo.basename):
self._not_using_because['incompatible compiler'].add(modname)
return False
- elif not module.compatible_cpu(self._archinfo, self._options):
- self._not_using_because['incompatible CPU'].add(modname)
- return False
return True
@staticmethod