d: Import dmd b8384668f, druntime e6caaab9, phobos 5ab9ad256 (v2.098.0-beta.1)

[thirdparty/binutils-gdb.git] / Makefile.tpl

diff --git a/Makefile.tpl b/Makefile.tpl
index deb8ab4751b500330a981f429d619b34666878c4..485b2f16fd2cde51b3b11d76fe8e24df2981ed9e 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -278,11 +278,14 @@ POSTSTAGE1_HOST_EXPORTS = \
        $(POSTSTAGE1_CXX_EXPORT) \
        $(LTO_EXPORTS) \
        GDC="$$r/$(HOST_SUBDIR)/prev-gcc/gdc$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
-         -B$(build_tooldir)/bin/ $(GDC_FLAGS_FOR_TARGET) \
+         -B$(build_tooldir)/bin/ $(GDCFLAGS_FOR_TARGET) \
+         -B$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime/gcc \
          -B$$r/prev-$(TARGET_SUBDIR)/libphobos/src \
+         -B$$r/prev-$(TARGET_SUBDIR)/libphobos/src/.libs \
          -I$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime -I$$s/libphobos/libdruntime \
          -L$$r/prev-$(TARGET_SUBDIR)/libphobos/src/.libs \
-         -L$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime/.libs"; \
+         -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
+         -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs"; \
        export GDC; \
        GDC_FOR_BUILD="$$GDC"; export GDC_FOR_BUILD; \
        GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \
@@ -533,6 +536,11 @@ STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \
          --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" \
          --disable-build-format-warnings
 
+@if target-libphobos-bootstrap
+STAGE1_CONFIGURE_FLAGS += --with-libphobos-druntime-only
+STAGE2_CONFIGURE_FLAGS += --with-libphobos-druntime-only
+@endif target-libphobos-bootstrap
+
 # When using the slow stage1 compiler disable IL verification and forcefully
 # enable it when using the stage2 compiler instead.  As we later compare
 # stage2 and stage3 we are merely avoid doing redundant work, plus we apply