re PR ada/64492 (Disabling libada prevents building gnattools-cross)

	PR ada/64492
	* gcc-interface/Makefile.in (../stamp-tools): Reinstate dropped code.

From-SVN: r219183

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 4e10baf67658272f43813e665d46ec00dd39723c..3ff202bee6b2a9837a0f998606b3dc3df2f21cd0 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-05  Eric Botcazou  <ebotcazou@adacore.com>
+
+       PR ada/64492
+       * gcc-interface/Makefile.in (../stamp-tools): Reinstate dropped code.
+
 2015-01-04  Uros Bizjak  <ubizjak@gmail.com>
 
        * gcc-interface/misc.c (internal_error_function): Use xasprintf instead

diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index a407919189913192693819eb99760bd3ef3eb1a6..eb24f113d05ca9b3ca4bb9458611b07cbcdd7534 100644 (file)
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -2481,9 +2481,16 @@ GCC_LINK=$(CXX) $(GCC_LINK_FLAGS) $(ADA_INCLUDES) $(LDFLAGS)
 # Build directory for the tools. Let's copy the target-dependent
 # sources using the same mechanism as for gnatlib. The other sources are
 # accessed using the vpath directive below
-# Note: dummy target, stamp-tools is mainly handled by gnattools.
 
 ../stamp-tools:
+       -$(RM) tools/*
+       -$(RMDIR) tools
+       -$(MKDIR) tools
+       -(cd tools; $(LN_S) ../sdefault.adb ../snames.ads ../snames.adb .)
+       -$(foreach PAIR,$(TOOLS_TARGET_PAIRS), \
+                 $(RM) tools/$(word 1,$(subst <, ,$(PAIR)));\
+                 $(LN_S) $(fsrcpfx)ada/$(word 2,$(subst <, ,$(PAIR))) \
+                       tools/$(word 1,$(subst <, ,$(PAIR)));)
        touch ../stamp-tools
 
 # when compiling the tools, the runtime has to be first on the path so that