From b97ffdc98307b01489022bd43a71fe40859828be Mon Sep 17 00:00:00 2001 From: Kai Tietz <ktietz@redhat.com> Date: Wed, 13 Feb 2013 11:19:26 +0100 Subject: [PATCH] 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: r196002 --- libada/ChangeLog | 6 ++++++ libada/Makefile.in | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/libada/ChangeLog b/libada/ChangeLog index ba2441c83fd5..9ddfe1ab7190 100644 --- a/libada/ChangeLog +++ b/libada/ChangeLog @@ -1,3 +1,9 @@ +2013-02-13 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 3bac8278cb20..983a54220407 100644 --- a/libada/Makefile.in +++ b/libada/Makefile.in @@ -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_RECURSIVE) $(ADA_RTS_DIR) adainclude + $(LN_S_RECURSIVE) $(ADA_RTS_DIR) adalib osconstool: $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) ./bldtools/oscons/xoscons -- GitLab