mirror of
https://github.com/NixOS/nix.git
synced 2025-11-24 11:19:35 +01:00
treewide: Fix Meson CPU names for powerpc CPUs
(cherry picked from commit 6db6190002)
This commit is contained in:
parent
af342d8b2b
commit
281e3b0247
5 changed files with 17 additions and 2 deletions
|
|
@ -23,6 +23,8 @@ dot = find_program('dot', native : true, required : false)
|
|||
|
||||
nix_bin_dir = fs.parent(nix.full_path())
|
||||
|
||||
subdir('nix-meson-build-support/default-system-cpu')
|
||||
|
||||
test_confdata = {
|
||||
'bindir': nix_bin_dir,
|
||||
'coreutils': fs.parent(coreutils.full_path()),
|
||||
|
|
@ -30,7 +32,7 @@ test_confdata = {
|
|||
'bash': bash.full_path(),
|
||||
'sandbox_shell': busybox.found() ? busybox.full_path() : '',
|
||||
'PACKAGE_VERSION': meson.project_version(),
|
||||
'system': host_machine.cpu_family() + '-' + host_machine.system(),
|
||||
'system': nix_system_cpu + '-' + host_machine.system(),
|
||||
}
|
||||
|
||||
# Just configures `common/vars-and-functions.sh.in`.
|
||||
|
|
|
|||
1
tests/functional/nix-meson-build-support
Symbolic link
1
tests/functional/nix-meson-build-support
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
../../nix-meson-build-support
|
||||
|
|
@ -39,6 +39,7 @@ mkMesonDerivation (
|
|||
|
||||
workDir = ./.;
|
||||
fileset = fileset.unions [
|
||||
../../nix-meson-build-support
|
||||
../../scripts/nix-profile.sh.in
|
||||
../../.version
|
||||
../../tests/functional
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue