aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2015-01-05 10:17:12 +0000
committerEric Botcazou <ebotcazou@gcc.gnu.org>2015-01-05 10:17:12 +0000
commitef3a7cca245878e8a53bba9548254c9662652cbe (patch)
tree9ac09a4816b7bad9861e83d14f6f3d1641e95106 /gcc
parent6a0a7f07823f6a8f5faec2fbe864313f0b726b59 (diff)
downloadgcc-ef3a7cca245878e8a53bba9548254c9662652cbe.zip
gcc-ef3a7cca245878e8a53bba9548254c9662652cbe.tar.gz
gcc-ef3a7cca245878e8a53bba9548254c9662652cbe.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/gcc-interface/Makefile.in9
2 files changed, 13 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 4e10baf..3ff202b 100644
--- 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 a407919..eb24f11 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