Build system: rename the LIBBFD_LINK variable to BFD_LDFLAGS

Makefile.config.in

@@ -167,7 +167,7 @@ PTHREAD_CAML_LINK=$(addprefix -cclib ,$(PTHREAD_LINK))
 
 UNIX_OR_WIN32=@unix_or_win32@
 UNIXLIB=@unixlib@
-LIBBFD_LINK=@libbfd_link@
+BFD_LDLIBS=@bfd_ldlibs@
 LIBBFD_INCLUDE=@libbfd_include@
 INSTALL_SOURCE_ARTIFACTS=@install_source_artifacts@
 

configure

@@ -719,7 +719,7 @@ sharedlib_cflags
 asm_cfi_supported
 AS
 ASPP
-libbfd_link
+bfd_ldlibs
 libbfd_include
 x_libraries
 x_includes
@@ -15869,7 +15869,7 @@ fi
 
 ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default"
 if test "x$ac_cv_header_bfd_h" = xyes; then :
-  libbfd_link=""
+  bfd_ldlibs=""
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
 $as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
 if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
@@ -15907,10 +15907,10 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
 $as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
 if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
-  libbfd_link="-lbfd"
+  bfd_ldlibs="-lbfd"
 fi
 
-  if test -z "$libbfd_link"; then :
+  if test -z "$bfd_ldlibs"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
 $as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
 if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
@@ -15948,11 +15948,11 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
 $as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
 if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
-  libbfd_link="-lbfd -ldl"
+  bfd_ldlibs="-lbfd -ldl"
 fi
 
 fi
-  if test -z "$libbfd_link"; then :
+  if test -z "$bfd_ldlibs"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
 $as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
 if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
@@ -15990,11 +15990,11 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
 $as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
 if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
-  libbfd_link="-lbfd -ldl -liberty"
+  bfd_ldlibs="-lbfd -ldl -liberty"
 fi
 
 fi
-  if test -z "$libbfd_link"; then :
+  if test -z "$bfd_ldlibs"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
 $as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
 if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
@@ -16032,11 +16032,11 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
 $as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
 if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
-  libbfd_link="-lbfd -ldl -liberty -lz"
+  bfd_ldlibs="-lbfd -ldl -liberty -lz"
 fi
 
 fi
-  if test -z "$libbfd_link"; then :
+  if test -z "$bfd_ldlibs"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
 $as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
 if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
@@ -16074,11 +16074,11 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
 $as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
 if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
-  libbfd_link="-lbfd -ldl -liberty -lz -lintl"
+  bfd_ldlibs="-lbfd -ldl -liberty -lz -lintl"
 fi
 
 fi
-  if test -n "$libbfd_link"; then :
+  if test -n "$bfd_ldlibs"; then :
   $as_echo "#define HAS_LIBBFD 1" >>confdefs.h
 
 else

configure.ac

@@ -132,7 +132,7 @@ AC_SUBST([pthread_link])
 AC_SUBST([x_includes])
 AC_SUBST([x_libraries])
 AC_SUBST([libbfd_include])
-AC_SUBST([libbfd_link])
+AC_SUBST([bfd_ldlibs])
 AC_SUBST([ASPP])
 AC_SUBST([AS])
 AC_SUBST([asm_cfi_supported])
@@ -1458,21 +1458,21 @@ AS_IF([test x"$enable_systhreads" = "xno"],
 ## libbfd
 
 AC_CHECK_HEADER([bfd.h],
-  [libbfd_link=""
-  AC_CHECK_LIB([bfd], [bfd_openr], [libbfd_link="-lbfd"])
-  AS_IF([test -z "$libbfd_link"],
-    [AC_CHECK_LIB([bfd], [bfd_openr], [libbfd_link="-lbfd -ldl"], [], [-ldl])])
-  AS_IF([test -z "$libbfd_link"],
+  [bfd_ldlibs=""
+  AC_CHECK_LIB([bfd], [bfd_openr], [bfd_ldlibs="-lbfd"])
+  AS_IF([test -z "$bfd_ldlibs"],
+    [AC_CHECK_LIB([bfd], [bfd_openr], [bfd_ldlibs="-lbfd -ldl"], [], [-ldl])])
+  AS_IF([test -z "$bfd_ldlibs"],
     [AC_CHECK_LIB([bfd], [bfd_openr],
-      [libbfd_link="-lbfd -ldl -liberty"], [], [-ldl -liberty])])
-  AS_IF([test -z "$libbfd_link"],
+      [bfd_ldlibs="-lbfd -ldl -liberty"], [], [-ldl -liberty])])
+  AS_IF([test -z "$bfd_ldlibs"],
     [AC_CHECK_LIB([bfd], [bfd_openr],
-      [libbfd_link="-lbfd -ldl -liberty -lz"], [], [-ldl -liberty -lz])])
-  AS_IF([test -z "$libbfd_link"],
+      [bfd_ldlibs="-lbfd -ldl -liberty -lz"], [], [-ldl -liberty -lz])])
+  AS_IF([test -z "$bfd_ldlibs"],
     [AC_CHECK_LIB([bfd], [bfd_openr],
-      [libbfd_link="-lbfd -ldl -liberty -lz -lintl"], [],
+      [bfd_ldlibs="-lbfd -ldl -liberty -lz -lintl"], [],
       [-ldl -liberty -lz -lintl])])
-  AS_IF([test -n "$libbfd_link"],
+  AS_IF([test -n "$bfd_ldlibs"],
     [AC_DEFINE([HAS_LIBBFD])],
     [AC_MSG_NOTICE(m4_normalize([
       BFD library not found, 'objinfo' will be unable to display

tools/Makefile

@@ -268,7 +268,7 @@ DEF_SYMBOL_PREFIX = '-Dsymbol_prefix=""'
 endif
 
 objinfo_helper$(EXE): objinfo_helper.$(O)
-	$(CC) $(OC_CFLAGS) $(OUTPUTEXE)$@ $< $(LIBBFD_LINK)
+	$(CC) $(OC_CFLAGS) $(OUTPUTEXE)$@ $< $(BFD_LDLIBS)
 
 objinfo_helper.$(O): $(ROOTDIR)/runtime/caml/s.h