inteltool: improve the libpci test in the Makefile
Use the verbatim variable method to define and export test code and
the actual libpci test from flashrom. This improves readability and
will work with stricter compiler (settings).
Change-Id: Iace7d53b0b992c4fde596ce1d606ad715d6dfc2a
Signed-off-by: Stefan Tauner <stefan.tauner@gmx.at>
Reviewed-on: http://review.coreboot.org/1575
Tested-by: build bot (Jenkins)
Reviewed-by: Anton Kochkov <anton.kochkov@gmail.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
diff --git a/util/inteltool/Makefile b/util/inteltool/Makefile
index af79b1e..6c94460 100644
--- a/util/inteltool/Makefile
+++ b/util/inteltool/Makefile
@@ -53,12 +53,24 @@
dep:
@$(CC) $(CFLAGS) -MM *.c > .dependencies
+define LIBPCI_TEST
+/* Avoid a failing test due to libpci header symbol shadowing breakage */
+#define index shadow_workaround_index
+#include <pci/pci.h>
+struct pci_access *pacc;
+int main(int argc, char **argv)
+{
+ (void) argc;
+ (void) argv;
+ pacc = pci_alloc();
+ return 0;
+}
+endef
+export LIBPCI_TEST
+
pciutils:
@printf "\nChecking for pciutils and zlib... "
- @$(shell ( printf "#include <pci/pci.h>\n"; \
- printf "struct pci_access *pacc;\n"; \
- printf "int main(int argc, char **argv)\n"; \
- printf "{ pacc = pci_alloc(); return 0; }\n"; ) > .test.c )
+ @echo "$$LIBPCI_TEST" > .test.c
@$(CC) $(CFLAGS) .test.c -o .test $(LDFLAGS) >/dev/null 2>&1 && \
printf "found.\n" || ( printf "not found.\n\n"; \
printf "Please install pciutils-devel and zlib-devel.\n"; \