diff options
author | Kai Tietz <ktietz@redhat.com> | 2013-02-13 10:21:25 +0000 |
---|---|---|
committer | Kai Tietz <ktietz@redhat.com> | 2013-02-13 10:21:25 +0000 |
commit | 47ae7b7a13487a07ac6dee08a6f5ae213361a93f (patch) | |
tree | e83cfdfdd4dd875d681385f908c068f5d3d4681d /libada | |
parent | f99e77359204d60f873dc0bec2b09127978462d0 (diff) |
PR target/52122
* Makefile.in (LN_S_RECUSIVE): New.
(adainclude, adalib): Use LN_S_RECURSIVE for copy.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@196004 138bc75d-0d04-0410-961f-82ee72b054a4
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 3ac329b20b6..71f548a8f7d 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. + 2012-03-01 Release Manager * GCC 4.6.3 released. diff --git a/libada/Makefile.in b/libada/Makefile.in index 2fa1c6a8c8f..dbead700555 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 GNATLIBFLAGS= -W -Wall -gnatpg @@ -106,8 +112,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 || \ @@ -115,8 +121,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 |