diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2023-02-26 17:33:33 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2023-02-28 20:24:51 +0200 |
| commit | 38b6d6d61ade589c9772f3b788afe2ca2ec88d15 (patch) | |
| tree | 02106cf75522845e2f4f85c6072992300c1239cd | |
| parent | 2aa4d6e54e1cabe86a0a12c9fd9f8205337629fa (diff) | |
| download | meson-38b6d6d61ade589c9772f3b788afe2ca2ec88d15.zip meson-38b6d6d61ade589c9772f3b788afe2ca2ec88d15.tar.gz meson-38b6d6d61ade589c9772f3b788afe2ca2ec88d15.tar.bz2 | |
Add a deb_ prefix to constants that are only used in Debian system detection.
| -rwxr-xr-x | mesonbuild/scripts/env2mfile.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/scripts/env2mfile.py b/mesonbuild/scripts/env2mfile.py index e0b78fc..583d2bd 100755 --- a/mesonbuild/scripts/env2mfile.py +++ b/mesonbuild/scripts/env2mfile.py @@ -131,11 +131,11 @@ def get_args_from_envvars(infos: MachineInfo) -> None: if objcpp_link_args: infos.link_args['objcpp'] = objcpp_link_args -cpu_family_map = { +deb_cpu_family_map = { 'mips64el': 'mips64', 'i686': 'x86', } -cpu_map = { +deb_cpu_map = { 'armhf': 'arm7hlf', 'mips64el': 'mips64' } @@ -178,10 +178,10 @@ def detect_cross_debianlike(options: T.Any) -> MachineInfo: data[k] = v host_arch = data['DEB_HOST_GNU_TYPE'] host_os = data['DEB_HOST_ARCH_OS'] - host_cpu_family = cpu_family_map.get(data['DEB_HOST_GNU_CPU'], - data['DEB_HOST_GNU_CPU']) - host_cpu = cpu_map.get(data['DEB_HOST_ARCH'], - data['DEB_HOST_ARCH']) + host_cpu_family = deb_cpu_family_map.get(data['DEB_HOST_GNU_CPU'], + data['DEB_HOST_GNU_CPU']) + host_cpu = deb_cpu_map.get(data['DEB_HOST_ARCH'], + data['DEB_HOST_ARCH']) host_endian = data['DEB_HOST_ARCH_ENDIAN'] compilerstems = [('c', 'gcc'), |