Patchwork Fix linker flag bug introduced in r1623

login
register
about
Submitter Carl-Daniel Hailfinger
Date 2012-11-29 22:26:35
Message ID <50B7E11B.6070803@gmx.net>
Download mbox | patch
Permalink /patch/3801/
State Accepted
Headers show

Comments

Carl-Daniel Hailfinger - 2012-11-29 22:26:35
Spotted by Idwer Vollering.

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>

and committed in r1623
Carl-Daniel Hailfinger - 2013-01-08 01:55:13
Am 29.11.2012 23:26 schrieb Carl-Daniel Hailfinger:
> Spotted by Idwer Vollering.
>
> 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>
>
> and committed in r1623

Sorry, this was committed in r1625.

Regards,
Carl-Daniel

Patch

Index: flashrom-Makefile_libusb_libpci_ldflags_fix/Makefile
===================================================================
--- flashrom-Makefile_libusb_libpci_ldflags_fix/Makefile	(Revision 1624)
+++ flashrom-Makefile_libusb_libpci_ldflags_fix/Makefile	(Revision 1625)
@@ -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;				\