Skip to content

Commit 0331296

Browse files
committed
lang/rust: drop bfd on powerpc
1 parent 26983fe commit 0331296

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

‎lang/rust/Makefile‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,10 @@ do-configure:
201201
# Rust doesn't call the system compiler with the full version of the target.
202202
# This makes powerpc miscompile due to the secure-plt ABI change.
203203
# Additionally, force using ld.bfd to work around a linking problem in rustc_mir
204-
@${PRINTF} '#!/bin/sh\nexec ${CC} "$$@" --target=powerpc-unknown-freebsd13.0' > ${WRKDIR}/cc-wrapper
204+
@${PRINTF} '#!/bin/sh\nexec ${CC} "$$@" --target=powerpc-unknown-freebsd13.2' > ${WRKDIR}/cc-wrapper
205205
@${CHMOD} +x ${WRKDIR}/cc-wrapper
206-
@${PRINTF} '#!/bin/sh\nexec ${CXX} "$$@" --target=powerpc-unknown-freebsd13.0' > ${WRKDIR}/cxx-wrapper
206+
@${PRINTF} '#!/bin/sh\nexec ${CXX} "$$@" --target=powerpc-unknown-freebsd13.2' > ${WRKDIR}/cxx-wrapper
207207
@${CHMOD} +x ${WRKDIR}/cxx-wrapper
208-
@${PRINTF} '#!/bin/sh\nexec ${CC} -fuse-ld=bfd "$$@" --target=powerpc-unknown-freebsd13.0' > ${WRKDIR}/ld-wrapper
209-
@${CHMOD} +x ${WRKDIR}/ld-wrapper
210208
.endif
211209
.for _target in ${_RUST_TARGETS}
212210
@${ECHO_CMD} '[target.${_target}]' >> ${WRKSRC}/config.toml
@@ -218,11 +216,7 @@ do-configure:
218216
@${ECHO_CMD} 'cc="${CC}"' >> ${WRKSRC}/config.toml
219217
@${ECHO_CMD} 'cxx="${CXX}"' >> ${WRKSRC}/config.toml
220218
.endif
221-
.if ${ARCH} == powerpc
222-
@${ECHO_CMD} 'linker="${WRKDIR}/ld-wrapper"' >> ${WRKSRC}/config.toml
223-
.else
224219
@${ECHO_CMD} 'linker="${CC}"' >> ${WRKSRC}/config.toml
225-
.endif
226220
.if ${PORT_OPTIONS:MPORT_LLVM}
227221
@${ECHO_CMD} 'llvm-config="${LOCALBASE}/bin/${LLVM_CONFIG}"' >> ${WRKSRC}/config.toml
228222
.endif

0 commit comments

Comments
 (0)