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
This commit is contained in:
parent
092a37c9f9
commit
7c6cc9de3a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=288076
@ -44,6 +44,8 @@ FILESMODE= ${LIBMODE}
|
|||||||
FILESOWN= ${LIBOWN}
|
FILESOWN= ${LIBOWN}
|
||||||
FILESGRP= ${LIBGRP}
|
FILESGRP= ${LIBGRP}
|
||||||
FILESDIR= ${LIBDIR}
|
FILESDIR= ${LIBDIR}
|
||||||
|
# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
|
||||||
|
.undef LIBRARIES_ONLY
|
||||||
|
|
||||||
${OBJS} ${SOBJS}: ${SRCS:M*.h}
|
${OBJS} ${SOBJS}: ${SRCS:M*.h}
|
||||||
|
|
||||||
|
@ -13,6 +13,8 @@ FILESMODE= ${LIBMODE}
|
|||||||
FILESOWN= ${LIBOWN}
|
FILESOWN= ${LIBOWN}
|
||||||
FILESGRP= ${LIBGRP}
|
FILESGRP= ${LIBGRP}
|
||||||
FILESDIR= ${LIBDIR}
|
FILESDIR= ${LIBDIR}
|
||||||
|
# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
|
||||||
|
.undef LIBRARIES_ONLY
|
||||||
|
|
||||||
CLEANFILES= ${OBJS}
|
CLEANFILES= ${OBJS}
|
||||||
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
|
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
|
||||||
|
@ -14,6 +14,8 @@ FILESMODE= ${LIBMODE}
|
|||||||
FILESOWN= ${LIBOWN}
|
FILESOWN= ${LIBOWN}
|
||||||
FILESGRP= ${LIBGRP}
|
FILESGRP= ${LIBGRP}
|
||||||
FILESDIR= ${LIBDIR}
|
FILESDIR= ${LIBDIR}
|
||||||
|
# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
|
||||||
|
.undef LIBRARIES_ONLY
|
||||||
|
|
||||||
CLEANFILES= ${OBJS}
|
CLEANFILES= ${OBJS}
|
||||||
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
|
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
|
||||||
|
@ -13,6 +13,8 @@ FILESMODE= ${LIBMODE}
|
|||||||
FILESOWN= ${LIBOWN}
|
FILESOWN= ${LIBOWN}
|
||||||
FILESGRP= ${LIBGRP}
|
FILESGRP= ${LIBGRP}
|
||||||
FILESDIR= ${LIBDIR}
|
FILESDIR= ${LIBDIR}
|
||||||
|
# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
|
||||||
|
.undef LIBRARIES_ONLY
|
||||||
|
|
||||||
CLEANFILES= ${OBJS}
|
CLEANFILES= ${OBJS}
|
||||||
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
|
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
|
||||||
|
@ -13,6 +13,8 @@ FILESMODE= ${LIBMODE}
|
|||||||
FILESOWN= ${LIBOWN}
|
FILESOWN= ${LIBOWN}
|
||||||
FILESGRP= ${LIBGRP}
|
FILESGRP= ${LIBGRP}
|
||||||
FILESDIR= ${LIBDIR}
|
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= ${OBJS} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o
|
||||||
CLEANFILES+= crt1_c.s gcrt1_c.s Scrt1_c.s
|
CLEANFILES+= crt1_c.s gcrt1_c.s Scrt1_c.s
|
||||||
|
@ -13,6 +13,8 @@ FILESMODE= ${LIBMODE}
|
|||||||
FILESOWN= ${LIBOWN}
|
FILESOWN= ${LIBOWN}
|
||||||
FILESGRP= ${LIBGRP}
|
FILESGRP= ${LIBGRP}
|
||||||
FILESDIR= ${LIBDIR}
|
FILESDIR= ${LIBDIR}
|
||||||
|
# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
|
||||||
|
.undef LIBRARIES_ONLY
|
||||||
|
|
||||||
CLEANFILES= ${OBJS}
|
CLEANFILES= ${OBJS}
|
||||||
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
|
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
|
||||||
|
@ -13,6 +13,8 @@ FILESMODE= ${LIBMODE}
|
|||||||
FILESOWN= ${LIBOWN}
|
FILESOWN= ${LIBOWN}
|
||||||
FILESGRP= ${LIBGRP}
|
FILESGRP= ${LIBGRP}
|
||||||
FILESDIR= ${LIBDIR}
|
FILESDIR= ${LIBDIR}
|
||||||
|
# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
|
||||||
|
.undef LIBRARIES_ONLY
|
||||||
|
|
||||||
CLEANFILES= ${OBJS}
|
CLEANFILES= ${OBJS}
|
||||||
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
|
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
|
||||||
|
@ -21,6 +21,8 @@ FILESMODE= ${LIBMODE}
|
|||||||
FILESOWN= ${LIBOWN}
|
FILESOWN= ${LIBOWN}
|
||||||
FILESGRP= ${LIBGRP}
|
FILESGRP= ${LIBGRP}
|
||||||
FILESDIR= ${LIBDIR}
|
FILESDIR= ${LIBDIR}
|
||||||
|
# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
|
||||||
|
.undef LIBRARIES_ONLY
|
||||||
|
|
||||||
CLEANFILES= ${OBJS}
|
CLEANFILES= ${OBJS}
|
||||||
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
|
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
|
||||||
|
@ -12,6 +12,8 @@ FILESMODE= ${LIBMODE}
|
|||||||
FILESOWN= ${LIBOWN}
|
FILESOWN= ${LIBOWN}
|
||||||
FILESGRP= ${LIBGRP}
|
FILESGRP= ${LIBGRP}
|
||||||
FILESDIR= ${LIBDIR}
|
FILESDIR= ${LIBDIR}
|
||||||
|
# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
|
||||||
|
.undef LIBRARIES_ONLY
|
||||||
|
|
||||||
CLEANFILES= ${OBJS}
|
CLEANFILES= ${OBJS}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user