diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index cefe2f947f..8bd599c25a 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -105,11 +105,12 @@ (define (cross-gcc-arguments target libc)
                                "--disable-libcilkrts")
                              `( ;; Disable features not needed at this stage.
                                "--disable-shared" "--enable-static"
+                               "--enable-languages=c,c++"
 
-                               ;; Disable C++ because libstdc++'s configure
-                               ;; script otherwise fails with "Link tests are not
-                               ;; allowed after GCC_NO_EXECUTABLES."
-                               "--enable-languages=c"
+                               ;; libstdc++ cannot be built at this stage
+                               ;; ("Link tests are not allowed after
+                               ;; GCC_NO_EXECUTABLES.").
+                               "--disable-libstdc++-v3"
 
                                "--disable-threads" ;libgcc, would need libc
                                "--disable-libatomic"