Attachment #199641 for bug #231804

Lines 150-158 Link Here

(-)Mk/bsd.gcc.mk (+5 lines)
150	CXX:= g++${V}	150	CXX:= g++${V}
151	CPP:= cpp${V}	151	CPP:= cpp${V}
152	_GCC_RUNTIME:= ${LOCALBASE}/lib/gcc${V}	152	_GCC_RUNTIME:= ${LOCALBASE}/lib/gcc${V}
		153	. if ${PORTNAME} == gcc
		154	# We don't want the rpath stuff while building gcc itself
		155	# so we do not set the FLAGS as done in the else part.
		156	. else
153	CFLAGS+= -Wl,-rpath=${_GCC_RUNTIME}	157	CFLAGS+= -Wl,-rpath=${_GCC_RUNTIME}
154	CXXFLAGS+= -Wl,-rpath=${_GCC_RUNTIME}	158	CXXFLAGS+= -Wl,-rpath=${_GCC_RUNTIME}
155	LDFLAGS+= -Wl,-rpath=${_GCC_RUNTIME} -L${_GCC_RUNTIME}	159	LDFLAGS+= -Wl,-rpath=${_GCC_RUNTIME} -L${_GCC_RUNTIME}
		160	. endif
156	. else # Use GCC in base.	161	. else # Use GCC in base.
157	CC:= gcc	162	CC:= gcc
158	CXX:= g++	163	CXX:= g++

Lines 70-75 Link Here

(-)lang/gcc7/Makefile (-1 / +8 lines)
70		70
71	LANGUAGES:= c,c++,objc,fortran	71	LANGUAGES:= c,c++,objc,fortran
72	TARGLIB= ${PREFIX}/lib/gcc${SUFFIX}	72	TARGLIB= ${PREFIX}/lib/gcc${SUFFIX}
		73	TARG32LIB= ${PREFIX}/lib32
73	LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX}	74	LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX}
74	GNU_CONFIGURE= yes	75	GNU_CONFIGURE= yes
75	CONFIGURE_OUTSOURCE= yes	76	CONFIGURE_OUTSOURCE= yes
Lines 138-144 Link Here
138	${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/	139	${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/
139	# Add target libraries and include files to packaging list.	140	# Add target libraries and include files to packaging list.
140	${RM} ${WRKDIR}/PLIST.lib	141	${RM} ${WRKDIR}/PLIST.lib
141	.for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}	142
		143	.if ${ARCH} == powerpc64 && ${PORT_OPTIONS:MMULTILIB}
		144	${MKDIR} -p ${STAGEDIR}${PREFIX}/lib32/gcc${SUFFIX}
		145	${MV} ${STAGEDIR}${PREFIX}/lib/lib32/* ${STAGEDIR}${PREFIX}/lib32/gcc${SUFFIX}
		146	.endif
		147
		148	.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARG32LIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}
142	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \	149	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
143	${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\	150	${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
144	fi	151	fi

Return to bug 231804