diff --git a/aconfigure b/aconfigure
index 870c157119..0f833e75d9 100755
--- a/aconfigure
+++ b/aconfigure
@@ -4848,7 +4848,7 @@ fi
 
 if test "$AR_FLAGS" = ""; then AR_FLAGS="rv"; fi
 
-if test "$LD" = ""; then LD="$CC"; fi
+if test "$LD" = ""; then LD="$CXX"; fi
 
 if test "$LDOUT" = ""; then LDOUT="-o "; fi
 
diff --git a/aconfigure.ac b/aconfigure.ac
index 1873d9ecfd..75bc78a20c 100644
--- a/aconfigure.ac
+++ b/aconfigure.ac
@@ -46,7 +46,7 @@ AC_CHECK_TOOLS([AR], [ar gar], :)
 
 if test "$AR_FLAGS" = ""; then AR_FLAGS="rv"; fi
 AC_SUBST(AR_FLAGS)
-if test "$LD" = ""; then LD="$CC"; fi
+if test "$LD" = ""; then LD="$CXX"; fi
 AC_SUBST(LD)
 if test "$LDOUT" = ""; then LDOUT="-o "; fi
 AC_SUBST(LDOUT)