[flashrom] [commit] r1625 - trunk
repository service
svn at flashrom.org
Thu Nov 29 23:22:04 CET 2012
Author: hailfinger
Date: Thu Nov 29 23:22:04 2012
New Revision: 1625
URL: http://flashrom.org/trac/flashrom/changeset/1625
Log:
Fix linker flag bug introduced in r1623.
Spotted by Idwer Vollering.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Modified:
trunk/Makefile
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Sat Nov 24 19:59:39 2012 (r1624)
+++ trunk/Makefile Thu Nov 29 23:22:04 2012 (r1625)
@@ -710,10 +710,10 @@
echo "See README for more information."; echo; \
rm -f .test.c .test.o; exit 1)
@printf "Checking if libpci is present and sufficient... "
- @$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(PCILIBS) >/dev/null && \
+ @$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(PCILIBS) >/dev/null && \
echo "yes." || ( echo "no."; \
printf "Checking if libz+libpci are present and sufficient..."; \
- $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(PCILIBS) -lz >/dev/null && \
+ $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(PCILIBS) -lz >/dev/null && \
( echo "yes."; echo "NEEDLIBZ := yes" > .libdeps ) || ( echo "no."; echo; \
echo "Please install libpci (package pciutils) and/or libz."; \
echo "See README for more information."; echo; \
@@ -729,7 +729,7 @@
echo "See README for more information."; echo; \
rm -f .test.c .test.o; exit 1)
@printf "Checking if libusb-0.1 is usable... "
- @$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(USBLIBS) >/dev/null && \
+ @$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USBLIBS) >/dev/null && \
echo "yes." || ( echo "no."; \
echo "Please install libusb-0.1 or libusb-compat."; \
echo "See README for more information."; echo; \
More information about the flashrom
mailing list