svn commit: r288076 - in head: gnu/lib/csu lib/csu/aarch64 lib/csu/amd64 lib/csu/arm lib/csu/i386 lib/csu/mips lib/csu/powerpc lib/csu/powerpc64 lib/csu/sparc64

[Bryan Drewery]

Author: bdrewery
Date: Mon Sep 21 21:44:02 2015
New Revision: 288076
URL: https://svnweb.freebsd.org/changeset/base/288076

Log:
  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

Modified:
  head/gnu/lib/csu/Makefile
  head/lib/csu/aarch64/Makefile
  head/lib/csu/amd64/Makefile
  head/lib/csu/arm/Makefile
  head/lib/csu/i386/Makefile
  head/lib/csu/mips/Makefile
  head/lib/csu/powerpc/Makefile
  head/lib/csu/powerpc64/Makefile
  head/lib/csu/sparc64/Makefile

Modified: head/gnu/lib/csu/Makefile
==============================================================================
--- head/gnu/lib/csu/Makefile	Mon Sep 21 18:52:52 2015	(r288075)
+++ head/gnu/lib/csu/Makefile	Mon Sep 21 21:44:02 2015	(r288076)
@@ -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}
 

Modified: head/lib/csu/aarch64/Makefile
==============================================================================
--- head/lib/csu/aarch64/Makefile	Mon Sep 21 18:52:52 2015	(r288075)
+++ head/lib/csu/aarch64/Makefile	Mon Sep 21 21:44:02 2015	(r288076)
@@ -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

Modified: head/lib/csu/amd64/Makefile
==============================================================================
--- head/lib/csu/amd64/Makefile	Mon Sep 21 18:52:52 2015	(r288075)
+++ head/lib/csu/amd64/Makefile	Mon Sep 21 21:44:02 2015	(r288076)
@@ -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

Modified: head/lib/csu/arm/Makefile
==============================================================================
--- head/lib/csu/arm/Makefile	Mon Sep 21 18:52:52 2015	(r288075)
+++ head/lib/csu/arm/Makefile	Mon Sep 21 21:44:02 2015	(r288076)
@@ -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

Modified: head/lib/csu/i386/Makefile
==============================================================================
--- head/lib/csu/i386/Makefile	Mon Sep 21 18:52:52 2015	(r288075)
+++ head/lib/csu/i386/Makefile	Mon Sep 21 21:44:02 2015	(r288076)
@@ -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

Modified: head/lib/csu/mips/Makefile
==============================================================================
--- head/lib/csu/mips/Makefile	Mon Sep 21 18:52:52 2015	(r288075)
+++ head/lib/csu/mips/Makefile	Mon Sep 21 21:44:02 2015	(r288076)
@@ -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

Modified: head/lib/csu/powerpc/Makefile
==============================================================================
--- head/lib/csu/powerpc/Makefile	Mon Sep 21 18:52:52 2015	(r288075)
+++ head/lib/csu/powerpc/Makefile	Mon Sep 21 21:44:02 2015	(r288076)
@@ -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

Modified: head/lib/csu/powerpc64/Makefile
==============================================================================
--- head/lib/csu/powerpc64/Makefile	Mon Sep 21 18:52:52 2015	(r288075)
+++ head/lib/csu/powerpc64/Makefile	Mon Sep 21 21:44:02 2015	(r288076)
@@ -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

Modified: head/lib/csu/sparc64/Makefile
==============================================================================
--- head/lib/csu/sparc64/Makefile	Mon Sep 21 18:52:52 2015	(r288075)
+++ head/lib/csu/sparc64/Makefile	Mon Sep 21 21:44:02 2015	(r288076)
@@ -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}