From ef3a7cca245878e8a53bba9548254c9662652cbe Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Mon, 5 Jan 2015 10:17:12 +0000 Subject: [PATCH] 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 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/gcc-interface/Makefile.in | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 4e10baf6765..3ff202bee6b 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2015-01-05 Eric Botcazou + + PR ada/64492 + * gcc-interface/Makefile.in (../stamp-tools): Reinstate dropped code. + 2015-01-04 Uros Bizjak * 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 a4079191899..eb24f113d05 100644 --- 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 -- 2.30.2