pyrox.dev
1--- sbsigntools/configure.ac 2018-09-25 10:30:00.878766256 -0500
2+++ configure.ac.new 2018-09-25 10:34:56.231277375 -0500
3@@ -71,15 +71,16 @@
4 # no consistent view of where gnu-efi should dump the efi stuff, so find it
5 ##
6 for path in /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /lib/efi /lib64/efi /usr/lib/efi /usr/lib64/efi; do
7- if test -e $path/crt0-efi-$EFI_ARCH.o; then
8- CRTPATH=$path
9+ if test -e @@NIX_GNUEFI@@/$path/crt0-efi-$EFI_ARCH.o; then
10+ CRTPATH=@@NIX_GNUEFI@@/$path
11+ break
12 fi
13 done
14 if test -z "$CRTPATH"; then
15 AC_MSG_ERROR([cannot find the gnu-efi crt path])
16 fi
17
18-EFI_CPPFLAGS="-I/usr/include/efi -I/usr/include/efi/$EFI_ARCH \
19+EFI_CPPFLAGS="-I@@NIX_GNUEFI@@/include/efi -I@@NIX_GNUEFI@@/include/efi/$EFI_ARCH \
20 -DEFI_FUNCTION_WRAPPER"
21 CPPFLAGS_save="$CPPFLAGS"
22 CPPFLAGS="$CPPFLAGS $EFI_CPPFLAGS"
23@@ -90,5 +91,5 @@
24 AC_SUBST(CRTPATH, $CRTPATH)
25
26 AC_CONFIG_FILES([Makefile src/Makefile lib/ccan/Makefile]
27- [docs/Makefile tests/Makefile])
28+ [docs/Makefile])
29 AC_OUTPUT