git: 882badb35a3f - main - lang/rust*: Only subst %CC% and %WRKDIR% on ppc64-elfv1

[Tobias Kortkamp]

The branch main has been updated by tobik:

URL: https://cgit.FreeBSD.org/ports/commit/?id=882badb35a3fd0c91134cc074a9654d31fc323e8

commit 882badb35a3fd0c91134cc074a9654d31fc323e8
Author:     Tobias Kortkamp <tobik at FreeBSD.org>
AuthorDate: 2021-05-14 11:02:43 +0000
Commit:     Tobias Kortkamp <tobik at FreeBSD.org>
CommitDate: 2021-05-14 16:44:58 +0000

    lang/rust*: Only subst %CC% and %WRKDIR% on ppc64-elfv1
    
    It's unused elsewhere.  Also move it to post-patch.
---
 lang/rust-bootstrap/Makefile |  2 +-
 lang/rust/Makefile           | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lang/rust-bootstrap/Makefile b/lang/rust-bootstrap/Makefile
index fbab19ccc909..735bd717559b 100644
--- a/lang/rust-bootstrap/Makefile
+++ b/lang/rust-bootstrap/Makefile
@@ -140,11 +140,11 @@ post-patch:
 .if ${FLAVOR} == powerpc64_elfv1
 	@${REINPLACE_CMD} -e 's,"c++","stdc++",g' \
 		${WRKSRC}/compiler/rustc_llvm/build.rs
-.endif
 	@${REINPLACE_CMD} -e 's,%CC%,${CC},g' \
 		-e 's,%WRKDIR%,${WRKDIR},g' \
 		${WRKSRC}/compiler/rustc_llvm/build.rs \
 		${WRKSRC}/src/bootstrap/native.rs
+.endif
 
 do-configure:
 # Check that the running kernel has COMPAT_FREEBSD11 required by lang/rust post-ino64
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 400eb27e9558..63acaac06de2 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -124,11 +124,16 @@ post-patch:
 # Disable vendor checksums
 	@${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \
 		${CARGO_VENDOR_DIR}/*/.cargo-checksum.json
-.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1 && ${LOCALBASE} != /usr/local
+.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
+	@${REINPLACE_CMD} 's,%CC%,${CC},g' \
+		${WRKSRC}/compiler/rustc_llvm/build.rs \
+		${WRKSRC}/src/bootstrap/native.rs
+.if ${LOCALBASE} != /usr/local
 	@${REINPLACE_CMD} 's,/usr/local/,${LOCALBASE}/,g' \
 		${WRKSRC}/compiler/rustc_llvm/build.rs \
 		${WRKSRC}/src/bootstrap/native.rs
 .endif
+.endif
 
 do-configure:
 # Check that the running kernel has COMPAT_FREEBSD11 required by lang/rust post-ino64
@@ -210,12 +215,6 @@ do-configure:
 # Don't abort if optional tools fail to build
 	@${ECHO_CMD} 'missing-tools=true' >> ${WRKSRC}/config.toml
 .endif
-	@${REINPLACE_CMD} 's,%CC%,${CC},g' \
-		${WRKSRC}/src/bootstrap/native.rs
-# this reinplace_cmd is used for ppc64-elfv1, don't remove it
-# even if sed_checked.sh says it's unused
-	@${REINPLACE_CMD} 's,%CC%,${CC},g' \
-		${WRKSRC}/compiler/rustc_llvm/build.rs
 
 do-build:
 	@cd ${WRKSRC} && \