From 7c6cc9de3a52ce4eb1f30a41aafc0174211806c6 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Mon, 21 Sep 2015 21:44:02 +0000 Subject: [PATCH] Fix installation of 32bit libraries after r288074. FILES is not used when LIBRARIES_ONLY is set, which is used to build and install the lib32 sysroot. All of the csu files do quality as "libraries" for this case so just undefine LIBRARIES_ONLY. This is still better than the previous realinstall handling as it does not hook into META_MODE properly. Sponsored by: EMC / Isilon Storage Division --- gnu/lib/csu/Makefile | 2 ++ lib/csu/aarch64/Makefile | 2 ++ lib/csu/amd64/Makefile | 2 ++ lib/csu/arm/Makefile | 2 ++ lib/csu/i386/Makefile | 2 ++ lib/csu/mips/Makefile | 2 ++ lib/csu/powerpc/Makefile | 2 ++ lib/csu/powerpc64/Makefile | 2 ++ lib/csu/sparc64/Makefile | 2 ++ 9 files changed, 18 insertions(+) diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile index e181bd5ec557..de78c7ea367c 100644 --- a/gnu/lib/csu/Makefile +++ b/gnu/lib/csu/Makefile @@ -44,6 +44,8 @@ FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} +# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. +.undef LIBRARIES_ONLY ${OBJS} ${SOBJS}: ${SRCS:M*.h} diff --git a/lib/csu/aarch64/Makefile b/lib/csu/aarch64/Makefile index 65284aea439b..9747619c233a 100644 --- a/lib/csu/aarch64/Makefile +++ b/lib/csu/aarch64/Makefile @@ -13,6 +13,8 @@ FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} +# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. +.undef LIBRARIES_ONLY CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s diff --git a/lib/csu/amd64/Makefile b/lib/csu/amd64/Makefile index d293534821e5..e9ca6b91ad6c 100644 --- a/lib/csu/amd64/Makefile +++ b/lib/csu/amd64/Makefile @@ -14,6 +14,8 @@ FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} +# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. +.undef LIBRARIES_ONLY CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s diff --git a/lib/csu/arm/Makefile b/lib/csu/arm/Makefile index 65284aea439b..9747619c233a 100644 --- a/lib/csu/arm/Makefile +++ b/lib/csu/arm/Makefile @@ -13,6 +13,8 @@ FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} +# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. +.undef LIBRARIES_ONLY CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile index 01fe0d863f52..d64f803e03ef 100644 --- a/lib/csu/i386/Makefile +++ b/lib/csu/i386/Makefile @@ -13,6 +13,8 @@ FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} +# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. +.undef LIBRARIES_ONLY CLEANFILES= ${OBJS} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o CLEANFILES+= crt1_c.s gcrt1_c.s Scrt1_c.s diff --git a/lib/csu/mips/Makefile b/lib/csu/mips/Makefile index 65284aea439b..9747619c233a 100644 --- a/lib/csu/mips/Makefile +++ b/lib/csu/mips/Makefile @@ -13,6 +13,8 @@ FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} +# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. +.undef LIBRARIES_ONLY CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s diff --git a/lib/csu/powerpc/Makefile b/lib/csu/powerpc/Makefile index 65284aea439b..9747619c233a 100644 --- a/lib/csu/powerpc/Makefile +++ b/lib/csu/powerpc/Makefile @@ -13,6 +13,8 @@ FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} +# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. +.undef LIBRARIES_ONLY CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s diff --git a/lib/csu/powerpc64/Makefile b/lib/csu/powerpc64/Makefile index fab7c5dbd5a3..09b643e1b3ad 100644 --- a/lib/csu/powerpc64/Makefile +++ b/lib/csu/powerpc64/Makefile @@ -21,6 +21,8 @@ FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} +# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. +.undef LIBRARIES_ONLY CLEANFILES= ${OBJS} CLEANFILES+= crt1.s gcrt1.s Scrt1.s diff --git a/lib/csu/sparc64/Makefile b/lib/csu/sparc64/Makefile index 26807897df56..0074cb998c2e 100644 --- a/lib/csu/sparc64/Makefile +++ b/lib/csu/sparc64/Makefile @@ -12,6 +12,8 @@ FILESMODE= ${LIBMODE} FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESDIR= ${LIBDIR} +# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. +.undef LIBRARIES_ONLY CLEANFILES= ${OBJS}