[1/2] toolchain-external: skip ld-musl symlink on static build

Static build with external musl toolchain leaves a dangling symlink to
libc.so. Don't create that symlink on static build.

Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 toolchain/toolchain-external/pkg-toolchain-external.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Hi Baruch,

On 27-06-17 19:57, Baruch Siach wrote:
> Static build with external musl toolchain leaves a dangling symlink to
> libc.so. Don't create that symlink on static build.
> 
> Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  toolchain/toolchain-external/pkg-toolchain-external.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk
> index 826934505e20..8460e37d095f 100644
> --- a/toolchain/toolchain-external/pkg-toolchain-external.mk
> +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk
> @@ -475,7 +475,7 @@ endef
>  # With the musl C library, the libc.so library directly plays the role
>  # of the dynamic library loader. We just need to create a symbolic
>  # link to libc.so with the appropriate name.
> -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y)
> +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL):$(BR2_STATIC_LIBS),y:)

 This patch conflicts with [1]. Could you combine them in a single series?
Otherwise looks good to me, but it really should be viewed combined with [1].

 Regards,
 Arnout

>  ifeq ($(BR2_i386),y)
>  MUSL_ARCH = i386
>  else ifeq ($(BR2_ARM_EABIHF),y)
> 

[1] http://patchwork.ozlabs.org/patch/780411/

Hello,

On Tue, 27 Jun 2017 20:57:15 +0300, Baruch Siach wrote:
> Static build with external musl toolchain leaves a dangling symlink to
> libc.so. Don't create that symlink on static build.
> 
> Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  toolchain/toolchain-external/pkg-toolchain-external.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Hello,

On Tue, 27 Jun 2017 23:41:44 +0200, Arnout Vandecappelle wrote:

> > diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk
> > index 826934505e20..8460e37d095f 100644
> > --- a/toolchain/toolchain-external/pkg-toolchain-external.mk
> > +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk
> > @@ -475,7 +475,7 @@ endef
> >  # With the musl C library, the libc.so library directly plays the role
> >  # of the dynamic library loader. We just need to create a symbolic
> >  # link to libc.so with the appropriate name.
> > -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y)
> > +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL):$(BR2_STATIC_LIBS),y:)  
> 
>  This patch conflicts with [1]. Could you combine them in a single series?
> Otherwise looks good to me, but it really should be viewed combined with [1].

I've applied Baruch patch, and I'll rebased mine on top.

Thanks,

Thomas

>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:

 > Static build with external musl toolchain leaves a dangling symlink to
 > libc.so. Don't create that symlink on static build.

 > Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
 > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 > Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Committed to 2017.02.x and 2017.05.x, thanks.