From d5231ea57f5982f8f0853428f99b6936a77fd4c6 Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Fri, 11 Nov 2011 22:21:30 +1100 Subject: [PATCH] Fix build error with -ldl being passed to LDFLAGS instead of LDADD and update configure output. --- Makefile.am | 4 ++-- configure.ac | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index de45c1fa..6f962908 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,8 +29,8 @@ cgminer_SOURCES = elist.h miner.h compat.h bench_block.h \ phatk110817.cl poclbm110817.cl \ sha2.c sha2.h -cgminer_LDFLAGS = $(PTHREAD_FLAGS) $(DLOPEN_FLAGS) -cgminer_LDADD = @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @OPENCL_LIBS@ @NCURSES_LIBS@ @PDCURSES_LIBS@ @WS2_LIBS@ lib/libgnu.a ccan/libccan.a +cgminer_LDFLAGS = $(PTHREAD_FLAGS) +cgminer_LDADD = $(DLOPEN_FLAGS) @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @OPENCL_LIBS@ @NCURSES_LIBS@ @PDCURSES_LIBS@ @WS2_LIBS@ lib/libgnu.a ccan/libccan.a cgminer_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @OPENCL_FLAGS@ if HAVE_x86_64 diff --git a/configure.ac b/configure.ac index 81959966..ea10d35a 100644 --- a/configure.ac +++ b/configure.ac @@ -320,12 +320,13 @@ else echo " ADL..................: Detection overrided. GPU monitoring support DISABLED" fi -echo " ASM..................: $has_yasm" +echo " ASM.(for CPU mining).: $has_yasm" echo echo "Compilation............: make (or gmake)" echo " CPPFLAGS.............: $CPPFLAGS" echo " CFLAGS...............: $CFLAGS" -echo " LDFLAGS..............: $LDFLAGS $PTHREAD_FLAGS $DLOPEN_FLAGS" +echo " LDFLAGS..............: $LDFLAGS $PTHREAD_FLAGS" +echo " LDADD................: $DLOPEN_FLAGS" echo echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')" echo " prefix...............: $prefix"