@@ -641,21 +641,7 @@ RUN ./build-aws-lc.sh --arch="${ARCH}" --target="${TARGET}" --go-dir="${HOME}/sd
641641
642642FROM sdk-go-1.25-prep AS sdk-go-1.25
643643
644- COPY --from=sdk-go-1.25-aws-lc-gnu-x86_64 \
645- /home/builder/aws-lc/build/goboringcrypto_linux_amd64.syso \
646- /home/builder/sdk-go/src/crypto/internal/boring/syso/goboringcrypto_linux_amd64.syso
647-
648- COPY --from=sdk-go-1.25-aws-lc-gnu-aarch64 \
649- /home/builder/aws-lc/build/goboringcrypto_linux_arm64.syso \
650- /home/builder/sdk-go/src/crypto/internal/boring/syso/goboringcrypto_linux_arm64.syso
651-
652- COPY --from=sdk-go-1.25-aws-lc-musl-x86_64 \
653- /home/builder/aws-lc/build/goboringcrypto_linux_amd64.syso \
654- /home/builder/sdk-go/src/crypto/internal/boring/syso/goboringcrypto_linux_musl_amd64.syso
655-
656- COPY --from=sdk-go-1.25-aws-lc-musl-aarch64 \
657- /home/builder/aws-lc/build/goboringcrypto_linux_arm64.syso \
658- /home/builder/sdk-go/src/crypto/internal/boring/syso/goboringcrypto_linux_musl_arm64.syso
644+ # FIPS/boringcrypto disabled - skipping aws-lc syso files
659645
660646COPY ./helpers/go/build-go.sh ./
661647
@@ -666,21 +652,7 @@ RUN ./build-go.sh --go-version=${GO125VER}
666652
667653FROM sdk-go-1.24-prep AS sdk-go-1.24
668654
669- COPY --from=sdk-go-1.24-aws-lc-gnu-x86_64 \
670- /home/builder/aws-lc/build/goboringcrypto_linux_amd64.syso \
671- /home/builder/sdk-go/src/crypto/internal/boring/syso/goboringcrypto_linux_amd64.syso
672-
673- COPY --from=sdk-go-1.24-aws-lc-gnu-aarch64 \
674- /home/builder/aws-lc/build/goboringcrypto_linux_arm64.syso \
675- /home/builder/sdk-go/src/crypto/internal/boring/syso/goboringcrypto_linux_arm64.syso
676-
677- COPY --from=sdk-go-1.24-aws-lc-musl-x86_64 \
678- /home/builder/aws-lc/build/goboringcrypto_linux_amd64.syso \
679- /home/builder/sdk-go/src/crypto/internal/boring/syso/goboringcrypto_linux_musl_amd64.syso
680-
681- COPY --from=sdk-go-1.24-aws-lc-musl-aarch64 \
682- /home/builder/aws-lc/build/goboringcrypto_linux_arm64.syso \
683- /home/builder/sdk-go/src/crypto/internal/boring/syso/goboringcrypto_linux_musl_arm64.syso
655+ # FIPS/boringcrypto disabled - skipping aws-lc syso files
684656
685657COPY ./helpers/go/build-go.sh ./
686658
@@ -1174,16 +1146,12 @@ COPY --chown=0:0 --from=sdk-go-1.24 \
11741146 /home/builder/sdk-go/licenses/ \
11751147 /usr/share/licenses/go-1.24/
11761148
1177- # Create Go trees for the different glibc and musl builds of the AWS-LC syso.
1149+ # Create Go trees for musl builds (no boringcrypto syso files) .
11781150# Sync timestamps to avoid rebuilds of the Go standard library.
11791151RUN \
11801152 for v in 1.24 1.25 ; do \
11811153 find /usr/libexec/go-${v} -type f -exec touch -r /usr/libexec/go-${v}/bin/go {} \+ && \
1182- rsync -aq --link-dest=/usr/libexec/go-${v}/ /usr/libexec/go-${v}{,-musl}/ && \
1183- rm /usr/libexec/go-${v}/src/crypto/internal/boring/syso/goboringcrypto_linux_musl_{arm,amd}64.syso && \
1184- rm /usr/libexec/go-${v}-musl/src/crypto/internal/boring/syso/goboringcrypto_linux_{arm,amd}64.syso && \
1185- mv /usr/libexec/go-${v}-musl/src/crypto/internal/boring/syso/goboringcrypto_linux_{musl_,}amd64.syso && \
1186- mv /usr/libexec/go-${v}-musl/src/crypto/internal/boring/syso/goboringcrypto_linux_{musl_,}arm64.syso ; \
1154+ rsync -aq --link-dest=/usr/libexec/go-${v}/ /usr/libexec/go-${v}{,-musl}/ ; \
11871155 done
11881156
11891157# "sdk-rust-tools" has our attribution generation and license scan tools.
0 commit comments