summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2012-11-29 22:22:04 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2012-11-29 22:22:04 +0000
commit9b253cceeed6449869f240ee6b39f5b54a9c0c37 (patch)
treea704339cefbf2c8b4151600560257ed627ad95e0 /Makefile
parenta59febd32bf67397e53825459f01a7ecdb665f85 (diff)
downloadflashrom-9b253cceeed6449869f240ee6b39f5b54a9c0c37.zip
flashrom-9b253cceeed6449869f240ee6b39f5b54a9c0c37.tar.gz
Fix linker flag bug introduced in r1623
Spotted by Idwer Vollering. Corresponding to flashrom svn r1625. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index a19c112..f3cb07a 100644
--- a/Makefile
+++ b/Makefile
@@ -710,10 +710,10 @@ ifeq ($(CHECK_LIBPCI), yes)
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 @@ ifeq ($(CHECK_LIBUSB0), yes)
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; \
OpenPOWER on IntegriCloud