From: David Kastrup <dak@gnu.org>
Date: Tue, 31 May 2016 13:52:42 +0000 (+0200)
Subject: Issue 4871: Autoconf variable $(LD) should be just for C
X-Git-Tag: release/2.19.43-1~25
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1b6d6de94a26c3e8b75e1f78f6d0cfc9eec96a89;p=lilypond.git

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 0037c58ca8..ed47b8350e 100644
--- 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 785be9ef6f..daf2d8659d 100644
--- 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 e10e83c7d8..7fbb413c78 100644
--- 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)