Browse Source

Fix build error with -ldl being passed to LDFLAGS instead of LDADD and update configure output.

Con Kolivas 14 years ago
parent
commit
d5231ea57f
2 changed files with 5 additions and 4 deletions
  1. 2 2
      Makefile.am
  2. 3 2
      configure.ac

+ 2 - 2
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

+ 3 - 2
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"