Skip to content

Commit

Permalink
qemu: Remove --cpu= flag
Browse files Browse the repository at this point in the history
'./configure --cpu=$(uname -m)' (essentially) breaks the case of riscv,
where the configure script expects '--cpu=riscv', but 'uname -m' gives
'riscv{32,64}'. This eventually leads to user-mode emulation being
disabled.

Since the configure script can auto-detect the parameter based on
compilers, remove this flag.

Originally added in NixOS#147692, but apparently it's not needed and @NickCao
couldn't remember why it was added. See also mailing list discussion at
https://lore.kernel.org/qemu-devel/[email protected]/T/
  • Loading branch information
dramforever committed Feb 9, 2023
1 parent f70071e commit 08e6d08
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion pkgs/applications/virtualization/qemu/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ stdenv.mkDerivation rec {
# have our patches and will be subtly broken because of that.
"--meson=meson"
"--cross-prefix=${stdenv.cc.targetPrefix}"
"--cpu=${stdenv.hostPlatform.uname.processor}"
(lib.enableFeature guestAgentSupport "guest-agent")
] ++ lib.optional numaSupport "--enable-numa"
++ lib.optional seccompSupport "--enable-seccomp"
Expand Down

0 comments on commit 08e6d08

Please sign in to comment.