diff -rup dist/libphobos/libdruntime/Makefile.am local/libphobos/libdruntime/Makefile.am
--- dist/libphobos/libdruntime/Makefile.am	2022-07-11 09:40:43.798158000 +0200
+++ local/libphobos/libdruntime/Makefile.am	2022-07-10 22:04:18.941416000 +0200
@@ -104,16 +104,16 @@ if DRUNTIME_CPU_S390
 endif
 
 # Provide __start_minfo, __stop_minfo if linker doesn't.
-DRTSTUFF = gcc/drtbegin.o gcc/drtend.o
+DRTSTUFF = gcc/drtbegin.lo gcc/drtend.lo
 
 toolexeclib_DATA = $(DRTSTUFF)
 
-gcc/drtbegin.o: gcc/drtstuff.d
-	$(GDC) -fno-druntime -fversion=DRT_BEGIN $(GDCFLAGS) $(MULTIFLAGS) \
+gcc/drtbegin.lo: gcc/drtstuff.d
+	$(LTDCOMPILE) -fno-druntime -fversion=DRT_BEGIN $(GDCFLAGS) $(MULTIFLAGS) \
 		$(D_EXTRA_DFLAGS) -c -o $@ $<
 
-gcc/drtend.o: gcc/drtstuff.d
-	$(GDC) -fno-druntime -fversion=DRT_END $(GDCFLAGS) $(MULTIFLAGS) \
+gcc/drtend.lo: gcc/drtstuff.d
+	$(LTDCOMPILE) -fno-druntime -fversion=DRT_END $(GDCFLAGS) $(MULTIFLAGS) \
 		$(D_EXTRA_DFLAGS) -c -o $@ $<
 
 # Generated by configure
@@ -128,7 +128,7 @@ ALL_DRUNTIME_SOURCES = $(DRUNTIME_DSOURC
 toolexeclib_LTLIBRARIES = libgdruntime.la
 libgdruntime_la_SOURCES = $(ALL_DRUNTIME_SOURCES)
 libgdruntime_la_LIBTOOLFLAGS =
-libgdruntime_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../src,-Bgcc \
+libgdruntime_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../src,-Bgcc/.libs \
     -version-info $(libtool_VERSION)
 libgdruntime_la_LIBADD = $(LIBATOMIC) $(LIBBACKTRACE)
 libgdruntime_la_DEPENDENCIES = $(DRTSTUFF)
diff -rup dist/libphobos/src/Makefile.am local/libphobos/src/Makefile.am
--- dist/libphobos/src/Makefile.am	2022-04-22 10:35:48.188886065 +0200
+++ local/libphobos/src/Makefile.am	2022-07-10 22:04:32.081171000 +0200
@@ -44,7 +44,7 @@ toolexeclib_DATA = libgphobos.spec
 toolexeclib_LTLIBRARIES = libgphobos.la
 libgphobos_la_SOURCES = $(ALL_PHOBOS_SOURCES)
 libgphobos_la_LIBTOOLFLAGS =
-libgphobos_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../libdruntime/gcc \
+libgphobos_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../libdruntime/gcc/.libs \
     -version-info $(libtool_VERSION)
 if ENABLE_LIBDRUNTIME_ONLY
 libgphobos_la_LIBADD = ../libdruntime/libgdruntime_convenience.la
diff -rup dist/libphobos/testsuite/testsuite_flags.in local/libphobos/testsuite/testsuite_flags.in
--- dist/libphobos/testsuite/testsuite_flags.in	2022-02-16 17:39:54.216833983 +0100
+++ local/libphobos/testsuite/testsuite_flags.in	2022-07-10 19:24:55.746013000 +0200
@@ -47,7 +47,7 @@ case ${query} in
       ;;
     --gdcldflags)
       GDCLDFLAGS="-B${BUILD_DIR}/src
-                  -B${BUILD_DIR}/libdruntime/gcc
+                  -B${BUILD_DIR}/libdruntime/gcc/.libs
                   -B${BUILD_DIR}/src/.libs
                   -L${BUILD_DIR}/src/.libs"
       echo ${GDCLDFLAGS}