diff options
| author | Kai Tietz <ktietz@redhat.com> | 2013-02-12 16:32:01 +0100 |
|---|---|---|
| committer | Kai Tietz <ktietz@gcc.gnu.org> | 2013-02-12 16:32:01 +0100 |
| commit | 3331275a42e7338ab4da5f181f93fd3c147d7f43 (patch) | |
| tree | 42aac2d6318a096490901791073fc84f0360cb6e /libada | |
| parent | 7cbda5184cbfe1afb46a7a026057c6bc917235ec (diff) | |
| download | gcc-3331275a42e7338ab4da5f181f93fd3c147d7f43.tar.gz | |
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: r195980
Diffstat (limited to 'libada')
| -rw-r--r-- | libada/ChangeLog | 6 | ||||
| -rw-r--r-- | libada/Makefile.in | 14 |
2 files changed, 16 insertions, 4 deletions
diff --git a/libada/ChangeLog b/libada/ChangeLog index ba2441c83fd..11a755047c9 100644 --- a/libada/ChangeLog +++ b/libada/ChangeLog @@ -1,3 +1,9 @@ +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 3bac8278cb2..119ab3fe1b8 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_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 |