diff options
| author | Kai Tietz <ktietz@redhat.com> | 2013-02-12 16:36:56 +0100 |
|---|---|---|
| committer | Kai Tietz <ktietz@gcc.gnu.org> | 2013-02-12 16:36:56 +0100 |
| commit | 24d1acdadd9c46c8ad6117b1e028fba0b6e9e17c (patch) | |
| tree | 3befdbfef72f4629fd1734f69e5cc45887002493 /libada | |
| parent | ded615461449b039efd287cb41700007c6c51426 (diff) | |
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
Diffstat (limited to 'libada')
| -rw-r--r-- | libada/ChangeLog | 7 | ||||
| -rw-r--r-- | libada/Makefile.in | 14 |
2 files changed, 17 insertions, 4 deletions
diff --git a/libada/ChangeLog b/libada/ChangeLog index 6fec9657929..2927bf116bd 100644 --- a/libada/ChangeLog +++ b/libada/ChangeLog @@ -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. diff --git a/libada/Makefile.in b/libada/Makefile.in index 389a2fb2f79..0beb42ca613 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 |