diff --no-dereference -Naur -- libstdc++.normalized/configure libstdc++.srctix/configure
--- libstdc++.normalized/configure	2019-04-17 00:50:00.000000000 +0200
+++ libstdc++.srctix/configure	2021-04-17 11:54:57.520344240 +0200
@@ -27278,8 +27278,9 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
 $as_echo "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
+  # PATCH: acl_cv_libext is never set. There's something really wrong with how
+  # this configure script was generated for Sortix libstdc++. It only works for
+  # cross-compilation and not native builds without this fix.
   hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
   hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
   hardcode_direct="$acl_cv_hardcode_direct"
diff --no-dereference -Naur -- libstdc++.normalized/tixbuildinfo libstdc++.srctix/tixbuildinfo
--- libstdc++.normalized/tixbuildinfo	1970-01-01 01:00:00.000000000 +0100
+++ libstdc++.srctix/tixbuildinfo	2019-04-17 01:29:24.602901892 +0200
@@ -0,0 +1,7 @@
+tix.version=1
+tix.class=srctix
+pkg.name=libstdc++
+pkg.build-libraries=libiconv?
+pkg.build-system=configure
+pkg.configure.use-build-directory=true
+pkg.post-install.cmd=tix-eradicate-libtool-la