Ticket #53605: patch-use-libcxx.2.diff

g++spec.c

@@ -46 +46 @@
 #endif
 
 #ifndef LIBSTDCXX
-#define LIBSTDCXX "stdc++"
+#define LIBSTDCXX "c++"
+#define LIBSTDCXXABI "c++abi"
 #endif
-#ifndef LIBSTDCXX_PROFILE
+#undef LIBSTDCXX_PROFILE
 #define LIBSTDCXX_PROFILE LIBSTDCXX
-#endif
+
 #ifndef LIBSTDCXX_STATIC
-#define LIBSTDCXX_STATIC NULL
+// this is a hack, probably to be dropped on systems that have a new enough libc++
+// which has `operator delete(void*, unsigned long)`
+#define LIBSTDCXX_STATIC "stdc++"
 #endif
 
 void
@@ -347 +350 @@
                        CL_DRIVER, &new_decoded_options[j]);
       added_libraries++;
       j++;
+      // add -lc++abi
+      generate_option (OPT_l, LIBSTDCXXABI, 1,
+                       CL_DRIVER, &new_decoded_options[j]);
+      added_libraries++;
+      j++;
       /* Add target-dependent static library, if necessary.  */
       if ((static_link || library > 1) && LIBSTDCXX_STATIC != NULL)
         {

incpath.c

@@ -129 +129 @@
   int relocated = cpp_relocated ();
   size_t len;
 
+  if (cxx_stdinc) {
+      add_path (xstrdup ("@PREFIX@/libexec/llvm-3.9/include/c++/v1"), SYSTEM, true, false);
+  }
   if (iprefix && (len = cpp_GCC_INCLUDE_DIR_len) != 0)
     {
       /* Look for directories that start with the standard prefix.