diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-04-02 15:04:53 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2021-04-02 15:04:53 -0400 |
| commit | 78d24d55422a1545ada0a0050aaf43365108781b (patch) | |
| tree | e8c5493edf120d831ceb1db5e0977193c1ac6f73 /testsuite/driver/cpu_features.py | |
| parent | ce706faeef3964116c6e1dd0e6ae2f2e77fde57d (diff) | |
| download | haskell-wip/T19640.tar.gz | |
Revert "[ci/arm/darwin/testsuite] Forwards ports from GHC-8.10"wip/T19640
This reverts commit 0cbdba2768d84a0f6832ae5cf9ea1e98efd739da.
Diffstat (limited to 'testsuite/driver/cpu_features.py')
| -rw-r--r-- | testsuite/driver/cpu_features.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/testsuite/driver/cpu_features.py b/testsuite/driver/cpu_features.py index 6e32d3b445..7b4340b61c 100644 --- a/testsuite/driver/cpu_features.py +++ b/testsuite/driver/cpu_features.py @@ -29,9 +29,7 @@ def get_cpu_features(): return flags elif config.os == 'darwin': - # we hardcode the sysctl path, otherwise we rely on /usr/sbin being in - # path. - out = subprocess.check_output(['/usr/sbin/sysctl', 'hw']).decode('UTF-8') + out = subprocess.check_output(['sysctl', 'hw']).decode('UTF-8') features = set() def check_feature(darwin_name, our_name=None): if re.search(r'hw\.optional.%s:\s*1' % darwin_name, out) is not None: @@ -68,3 +66,4 @@ if __name__ == '__main__': import sys config.os = sys.argv[1] print(get_cpu_features()) + |