manibuilder/anita: Move environment overrides to Makefile.anita
Also be specific where we have to allow warnings and drop a long unused
override for anita:7.1-sparc.
Change-Id: I962ecbbeee2813237421ab866b54f2de79cc4a20
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom-stable/+/73773
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/util/manibuilder/Makefile.anita b/util/manibuilder/Makefile.anita
index 9865c3e..25695ec 100644
--- a/util/manibuilder/Makefile.anita
+++ b/util/manibuilder/Makefile.anita
@@ -59,3 +59,12 @@
$(ANITA_KVM_TAGS): MANI_DOCKER_ARGS=--privileged
$(ANITA_KVM_TAGS): MANI_DOCKER_ARGS+=--env ANITA_VMM_ARGS="-enable-kvm"
+
+# Always use GNU make
+$(ANITA_TAGS): MAKECMD=gmake
+
+# No libjaylink
+$(ANITA_TAGS): MAKEARGS+=CONFIG_JLINK_SPI=no
+
+# Compiler doesn't like simplified initializers, e.g. `= { 0 };`
+anita\:7.1-i386 anita\:7.1-amd64: MAKEARGS+=WARNERROR=no