Add a deb_ prefix to constants that are only used in Debian system detection.

pull/11478/head
Jussi Pakkanen 2 years ago
parent 2aa4d6e54e
commit 38b6d6d61a
  1. 12
      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'),

Loading…
Cancel
Save