re PR target/52122 (incorrect ln -s replacement for mingw like targets in configure files)

PR target/52122
        * Makefile.in (LN_S_RECUSIVE): New.
        (adainclude, adalib): Use LN_S_RECURSIVE for copy.

From-SVN: r195981
This commit is contained in:
Kai Tietz 2013-02-12 16:36:56 +01:00 committed by Kai Tietz
parent ded6154614
commit 24d1acdadd
2 changed files with 17 additions and 4 deletions

View File

@ -1,3 +1,10 @@
2013-02-12 Kai Tietz <ktietz@redhat.com>
Backport from mainline
PR target/52122
* Makefile.in (LN_S_RECUSIVE): New.
(adainclude, adalib): Use LN_S_RECURSIVE for copy.
2012-09-20 Release Manager
* GCC 4.7.2 released.

View File

@ -43,6 +43,12 @@ 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
@ -100,8 +106,8 @@ gnatlib-plain: osconstool $(GCC_DIR)/ada/Makefile
&& touch stamp-libada
-rm -rf adainclude
-rm -rf adalib
$(LN_S) $(ADA_RTS_DIR) adainclude
$(LN_S) $(ADA_RTS_DIR) adalib
$(LN_S_RECURSIVE) $(ADA_RTS_DIR) adainclude
$(LN_S_RECURSIVE) $(ADA_RTS_DIR) adalib
gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile
test -f stamp-libada || \
@ -109,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) $(ADA_RTS_DIR) adainclude
$(LN_S) $(ADA_RTS_DIR) adalib
$(LN_S_RECUSIVE) $(ADA_RTS_DIR) adainclude
$(LN_S_RECUSIVE) $(ADA_RTS_DIR) adalib
osconstool:
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) ./bldtools/oscons/xoscons