summaryrefslogtreecommitdiff
path: root/libada
diff options
context:
space:
mode:
authorktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4>2013-02-13 10:01:13 +0000
committerktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4>2013-02-13 10:01:13 +0000
commitf8ff715c90b374c5e2b99f0c33a820e15709729b (patch)
tree4a3529f1cc2c13b14806cfab717bb5e57a2ed7ab /libada
parent319f4d7d38a1d99bf8e133124156baaa65d0c013 (diff)
downloadgcc-f8ff715c90b374c5e2b99f0c33a820e15709729b.tar.gz
Revert rev. 195980
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@196001 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libada')
-rw-r--r--libada/ChangeLog6
-rw-r--r--libada/Makefile.in14
2 files changed, 4 insertions, 16 deletions
diff --git a/libada/ChangeLog b/libada/ChangeLog
index 11a755047c9..ba2441c83fd 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,9 +1,3 @@
-2013-02-12 Kai Tietz <ktietz@redhat.com>
-
- PR target/52122
- * Makefile.in (LN_S_RECUSIVE): New.
- (adainclude, adalib): Use LN_S_RECURSIVE for copy.
-
2013-01-14 Richard Sandiford <rdsandiford@googlemail.com>
Update copyright years.
diff --git a/libada/Makefile.in b/libada/Makefile.in
index 119ab3fe1b8..3bac8278cb2 100644
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -43,12 +43,6 @@ enable_shared = @enable_shared@
LN_S=@LN_S@
AWK=@AWK@
-ifeq (cp -p,$(LN_S))
-LN_S_RECURSIVE = cp -pR
-else
-LN_S_RECURSIVE = $(LN_S)
-endif
-
# Variables for the user (or the top level) to override.
objext=.o
THREAD_KIND=native
@@ -106,8 +100,8 @@ gnatlib-plain: osconstool $(GCC_DIR)/ada/Makefile
&& touch stamp-libada
-rm -rf adainclude
-rm -rf adalib
- $(LN_S_RECURSIVE) $(ADA_RTS_DIR) adainclude
- $(LN_S_RECURSIVE) $(ADA_RTS_DIR) adalib
+ $(LN_S) $(ADA_RTS_DIR) adainclude
+ $(LN_S) $(ADA_RTS_DIR) adalib
gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile
test -f stamp-libada || \
@@ -115,8 +109,8 @@ gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile
&& touch stamp-libada
-rm -rf adainclude
-rm -rf adalib
- $(LN_S_RECUSIVE) $(ADA_RTS_DIR) adainclude
- $(LN_S_RECUSIVE) $(ADA_RTS_DIR) adalib
+ $(LN_S) $(ADA_RTS_DIR) adainclude
+ $(LN_S) $(ADA_RTS_DIR) adalib
osconstool:
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) ./bldtools/oscons/xoscons