diff options
| author | Roland McGrath <roland@hack.frob.com> | 2015-07-08 14:21:41 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2015-07-08 14:21:41 -0700 |
| commit | 85ee9a0d19ec8f5fca60f6bbe65e663329100118 (patch) | |
| tree | f3c30a761188c1ed55458629d0f597307f9838d0 | |
| parent | b8a91836171f5722bd5bef6dc2e9ce263c897974 (diff) | |
| download | glibc-85ee9a0d19ec8f5fca60f6bbe65e663329100118.tar.gz glibc-85ee9a0d19ec8f5fca60f6bbe65e663329100118.tar.xz glibc-85ee9a0d19ec8f5fca60f6bbe65e663329100118.zip | |
Fix some places to use $(LN_S) makefile variable.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makerules | 3 | ||||
| -rw-r--r-- | elf/Makefile | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index c841dafd56..90d5fa016a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2015-07-08 Roland McGrath <roland@hack.frob.com> + * Makerules (do-install-so): Use $(LN_S) rather than explicit 'ln -s'. + * elf/Makefile ($(objpfx)$(rtld-installed-name)): Use $(make-link) + rather than explicit 'ln -s'. + * resolv/rpc/netdb.h: New file. * resolv/Makefile [sunrpc not in $(subdirs)] (headers): Add it. diff --git a/Makerules b/Makerules index 372b3c0103..f9ca3f5021 100644 --- a/Makerules +++ b/Makerules @@ -1132,7 +1132,8 @@ endif define do-install-so $(do-install-program) -$(patsubst %,ln -s -f $(@F) $(@D)/$(patsubst %$*.so,%,$(<F))$(libprefix)$*.so,\ +$(patsubst %,$(LN_S) -f $(@F) \ + $(@D)/$(patsubst %$*.so,%,$(<F))$(libprefix)$*.so,\ $(filter-out %.so,$@)) endef diff --git a/elf/Makefile b/elf/Makefile index bd0f24dd51..e439527fb9 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -377,8 +377,7 @@ ifneq (ld.so,$(rtld-installed-name)) # Make sure ld.so.1 exists in the build directory so we can link # against it. $(objpfx)$(rtld-installed-name): $(objpfx)ld.so - rm -f $@ - ln -s $(<F) $@ + $(make-link) generated += $(rtld-installed-name) endif |