Issue 4871: Autoconf variable $(LD) should be just for C

We link using $(CXX) for C++.  This was smudged together previously.

diff --git a/aclocal.m4 b/aclocal.m4
index 0037c58ca807c403a206647415ed64ef8c00bf05..ed47b8350efe006c1bf6443d775b79bd282ebece 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -281,11 +281,9 @@ AC_DEFUN(STEPMAKE_CXX, [
     STEPMAKE_OPTIONAL_REQUIRED(CXX, c++, $1)
 
     CXXFLAGS="$CXXFLAGS $OPTIMIZE"
-    LD='$(CXX)'
 
     AC_SUBST(CXX)
     AC_SUBST(CXXFLAGS)
-    AC_SUBST(LD)
 ])
 
 

diff --git a/stepmake/stepmake/executable-rules.make b/stepmake/stepmake/executable-rules.make
index 785be9ef6f4ee1e1ba84e1db581facab63aef0d8..daf2d8659d1b90c966349c6b167fa4b6103f3697 100644 (file)
--- a/stepmake/stepmake/executable-rules.make
+++ b/stepmake/stepmake/executable-rules.make
@@ -10,4 +10,4 @@ $(O_FILES): $(outdir)/config.hh
 
 $(EXECUTABLE): $(O_FILES) $(outdir)/version.hh $(MODULE_LIBS:%=%/$(outdir)/library.a)
        $(foreach a, $(MODULE_LIBS), $(MAKE) -C $(a) && ) true
-       $(LD) -o $@ $(O_FILES) $(LOADLIBES) $(ALL_LDFLAGS)
+       $(CXX) -o $@ $(O_FILES) $(LOADLIBES) $(ALL_LDFLAGS)

diff --git a/stepmake/stepmake/test-rules.make b/stepmake/stepmake/test-rules.make
index e10e83c7d8fbdee9b4bc110de4d961d7bdd9caf6..7fbb413c78e12b5e1633a8d2d155a52f5742cc70 100644 (file)
--- a/stepmake/stepmake/test-rules.make
+++ b/stepmake/stepmake/test-rules.make
@@ -8,4 +8,4 @@ $(foreach a, $(MODULE_LIBS), $(eval $(call MODULE_LIB_template,$(a))))
 
 $(TEST_EXECUTABLE): $(TEST_O_FILES) $(TEST_MODULE_LIBS:%=%/$(outdir)/library.a)
        $(foreach a, $(TEST_MODULE_LIBS), $(MAKE) -C $(a) && ) true
-       $(LD) -o $@ $(TEST_O_FILES) $(TEST_LOADLIBES) $(ALL_LDFLAGS)
+       $(CXX) -o $@ $(TEST_O_FILES) $(TEST_LOADLIBES) $(ALL_LDFLAGS)