Commit 460ad044 by Iain Buclaw Committed by Iain Buclaw

d: Use build_exeext suffix for D generator programs.

Updated build and invocation of idgen and impcnvgen, ensuring that they
are removed when cleaning the build directory.

Added BUILD_LIBDEPS on the link command for the generator programs as
well, which is necessary when the system installed compiler is not GCC.

gcc/d/ChangeLog:

2019-04-16  Iain Buclaw  <ibuclaw@gdcproject.org>

	* Make-lang.in (d.mostyclean): Clean idgen and impcnvgen.
	(d/idgen): Rename to d/idgen$(build_exeext), add BUILD_LIBDEPS.
	(d/impcnvgen): Rename to d/impcnvgen$(build_exeext), add
	BUILD_LIBDEPS.
	(d/id.c): Call idgen$(build_exeext).
	(d/impcnvtab.c): Call impcnvgen$(build_exeext).

From-SVN: r270397
parent 0382a41d
2019-04-16 Iain Buclaw <ibuclaw@gdcproject.org>
* Make-lang.in (d.mostyclean): Clean idgen and impcvgen.
(d/idgen): Rename to d/idgen$(build_exeext), add BUILD_LIBDEPS.
(d/impcvgen): Rename to d/impcvgen$(build_exeext), add BUILD_LIBDEPS.
(d/id.c): Call idgen$(build_exeext).
(d/impcnvtab.c): Call impcvgen$(build_exeext).
2019-04-14 Johannes Pfau <johannespfau@gmail.com> 2019-04-14 Johannes Pfau <johannespfau@gmail.com>
PR d/87799 PR d/87799
* d-system.h (_mkdir): Forward _mkdir on MinGW to mkdir in system.h. * d-system.h (_mkdir): Forward _mkdir on MinGW to mkdir in system.h.
......
...@@ -279,7 +279,8 @@ d.mostlyclean: ...@@ -279,7 +279,8 @@ d.mostlyclean:
-rm -f d/*$(objext) -rm -f d/*$(objext)
-rm -f d/*$(coverageexts) -rm -f d/*$(coverageexts)
-rm -f $(D_GENERATED_SRCS) -rm -f $(D_GENERATED_SRCS)
-rm -f d/gdc$(exeext) gdc-cross$(exeext) d/d21$(exeext) -rm -f d/idgen$(build_exeext) d/impcnvgen$(build_exeext)
-rm -f gdc$(exeext) gdc-cross$(exeext) d21$(exeext)
d.clean: d.clean:
d.distclean: d.distclean:
d.maintainer-clean: d.maintainer-clean:
...@@ -316,21 +317,23 @@ d/%.o: d/dmd/root/%.c $(D_GENERATED_SRCS) ...@@ -316,21 +317,23 @@ d/%.o: d/dmd/root/%.c $(D_GENERATED_SRCS)
$(POSTCOMPILE) $(POSTCOMPILE)
# Generated programs. # Generated programs.
d/idgen: d/idgen.dmdgen.o d/idgen$(build_exeext): d/idgen.dmdgen.o $(BUILD_LIBDEPS)
+$(LINKER_FOR_BUILD) $(BUILD_LINKERFLAGS) $(BUILD_LDFLAGS) -o $@ $^ +$(LINKER_FOR_BUILD) $(BUILD_LINKERFLAGS) $(BUILD_LDFLAGS) -o $@ \
$(filter-out $(BUILD_LIBDEPS), $^) $(BUILD_LIBS)
d/impcvgen: d/impcnvgen.dmdgen.o d/impcnvgen$(build_exeext): d/impcnvgen.dmdgen.o $(BUILD_LIBDEPS)
+$(LINKER_FOR_BUILD) $(BUILD_LINKERFLAGS) $(BUILD_LDFLAGS) -o $@ $^ +$(LINKER_FOR_BUILD) $(BUILD_LINKERFLAGS) $(BUILD_LDFLAGS) -o $@ \
$(filter-out $(BUILD_LIBDEPS), $^) $(BUILD_LIBS)
# Generated sources. # Generated sources.
d/id.c: d/idgen d/id.c: d/idgen$(build_exeext)
cd d && ./idgen cd d && ./idgen$(build_exeext)
# idgen also generates id.h; just verify it exists. # idgen also generates id.h; just verify it exists.
d/id.h: d/id.c d/id.h: d/id.c
d/impcnvtab.c: d/impcvgen d/impcnvtab.c: d/impcnvgen$(build_exeext)
cd d && ./impcvgen cd d && ./impcnvgen$(build_exeext)
d/%.dmdgen.o: $(srcdir)/d/dmd/%.c d/%.dmdgen.o: $(srcdir)/d/dmd/%.c
$(DMDGEN_COMPILE) $(D_INCLUDES) $< $(DMDGEN_COMPILE) $(D_INCLUDES) $<
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment