public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-4197] Darwin, D: Fix bootstrap when target does not support -Bstatic/dynamic.
@ 2021-10-05 19:55 Iain D Sandoe
  0 siblings, 0 replies; only message in thread
From: Iain D Sandoe @ 2021-10-05 19:55 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:e24760533b62bb7068e63eb8da49dbca2837d38d

commit r12-4197-ge24760533b62bb7068e63eb8da49dbca2837d38d
Author: Iain Sandoe <iain@sandoe.co.uk>
Date:   Tue Oct 5 19:54:30 2021 +0100

    Darwin, D: Fix bootstrap when target does not support -Bstatic/dynamic.
    
    This fixes a bootstrap fail because saw_static_libcxx was unused for
    targets without support for -Bstatic/dynamic.
    
    The fix applied pushes the -static-libstdc++ back onto the command
    line, which allows a target to substitute a static version of the
    c++ standard library using specs.
    
    Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>
    
    gcc/d/ChangeLog:
    
            * d-spec.cc (lang_specific_driver): Push the -static-libstdc++
            option back onto the command line for targets without support
            for -Bstatic/dynamic.

Diff:
---
 gcc/d/d-spec.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gcc/d/d-spec.cc b/gcc/d/d-spec.cc
index 5adc662c6f2..b12d28f1047 100644
--- a/gcc/d/d-spec.cc
+++ b/gcc/d/d-spec.cc
@@ -468,6 +468,12 @@ lang_specific_driver (cl_decoded_option **in_decoded_options,
 	  generate_option (OPT_Wl_, LD_STATIC_OPTION, 1, CL_DRIVER,
 			   &new_decoded_options[j++]);
 	}
+#else
+      /* Push the -static-libstdc++ option back onto the command so that
+	 a target without LD_STATIC_DYNAMIC can use outfile substitution.  */
+      if (saw_static_libcxx && !static_link)
+	generate_option (OPT_static_libstdc__, NULL, 1, CL_DRIVER,
+			 &new_decoded_options[j++]);
 #endif
       if (saw_libcxx)
 	new_decoded_options[j++] = *saw_libcxx;


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-10-05 19:55 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-05 19:55 [gcc r12-4197] Darwin, D: Fix bootstrap when target does not support -Bstatic/dynamic Iain D Sandoe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).