Simplify the creation of the multilib-related sub-directory tree on

powerpc64 and avoid leaving an empty directory behind on the way.

PR:		235964, 231804
Discussed with:	Piotr Kubaj <pkubaj@anongoth.pl>
This commit is contained in:
Gerald Pfeifer 2019-03-12 15:56:12 +00:00
parent 166e7c3312
commit 1c7947c0f0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=495463

View File

@ -174,9 +174,8 @@ post-stage:
${RM} ${WRKDIR}/PLIST.lib
.if ${ARCH} == powerpc64 && ${PORT_OPTIONS:MMULTILIB}
${MKDIR} ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX}
${MV} ${STAGEDIR}${PREFIX}/lib/lib32/* ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX}
${RMDIR} ${STAGEDIR}${PREFIX}/lib/lib32
${MKDIR} ${STAGEDIR}${TARGLIB32}
${MV} ${STAGEDIR}${PREFIX}/lib/lib32 ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX}
.endif
.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB32:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax