From 532be75a309bf35968f70c52a1de97a40da2303b Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Wed, 13 Feb 2013 10:58:10 +0100 Subject: [PATCH] Revert rev 195982 From-SVN: r195999 --- libada/ChangeLog | 7 ------- libada/Makefile.in | 14 ++++---------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/libada/ChangeLog b/libada/ChangeLog index 85ba3cd281cf..3ac329b20b6a 100644 --- a/libada/ChangeLog +++ b/libada/ChangeLog @@ -1,10 +1,3 @@ -2013-02-12 Kai Tietz - - Back-merged from mainline. - PR target/52122 - * Makefile.in (LN_S_RECUSIVE): New. - (adainclude, adalib): Use LN_S_RECURSIVE for copy. - 2012-03-01 Release Manager * GCC 4.6.3 released. diff --git a/libada/Makefile.in b/libada/Makefile.in index e6120a39c06d..2fa1c6a8c8f3 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 GNATLIBFLAGS= -W -Wall -gnatpg @@ -112,8 +106,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 || \ @@ -121,8 +115,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 -- 2.47.2