Merge remote-tracking branch 'origin/pr/171'

* origin/pr/171: Disable annobin for the hypervisor build
QubesOS · Dec 10, 2023 · 7677f00 · 7677f00
2 parents 1a02560 + 822645c
commit 7677f00
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/xen.spec.in b/xen.spec.in
@@ -466,6 +466,8 @@ export LDFLAGS="$LDFLAGS_SAVE"
 export CFLAGS="$CFLAGS_SAVE -Wno-error=address"
 
 %if %build_hyp
+# QUBES SPECIFIC LINE
+export CFLAGS=`echo $CFLAGS | sed -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//g'`
 %if %build_crosshyp
 export CFLAGS=`echo $CFLAGS | sed -e 's/-m32//g' -e 's/-march=i686//g' 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//g'`
 XEN_TARGET_ARCH=x86_64 %make_build %{?efi_flags} prefix=/usr xen CC="/usr/bin/x86_64-linux-gnu-gcc"