The branch main has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=d2ce3d89e93cab3942b771ccd64e7c83532c090a

commit d2ce3d89e93cab3942b771ccd64e7c83532c090a
Author:     Mark Johnston <[email protected]>
AuthorDate: 2023-12-06 18:39:48 +0000
Commit:     Mark Johnston <[email protected]>
CommitDate: 2023-12-06 18:41:34 +0000

    conf: Expand the include path for more openssl files
    
    Fixes:  e655cc70dfcd ("ossl: Move arm_arch.h to a common subdirectory")
    Reported by:    Jenkins
---
 sys/conf/files.arm64 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index 5d9464bade9c..e6f525e63e64 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -136,17 +136,17 @@ ghashv8-armx.o                                    
optional armv8crypto    \
 crypto/des/des_enc.c                           optional netsmb
 crypto/openssl/ossl_aarch64.c                  optional ossl
 crypto/openssl/aarch64/chacha-armv8.S          optional ossl           \
-       compile-with    "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} 
${.IMPSRC}"
+       compile-with    "${CC} -c ${CFLAGS:N-mgeneral-regs-only} 
-I$S/crypto/openssl ${WERROR} ${.IMPSRC}"
 crypto/openssl/aarch64/poly1305-armv8.S                optional ossl           
\
-       compile-with    "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} 
${.IMPSRC}"
+       compile-with    "${CC} -c ${CFLAGS:N-mgeneral-regs-only} 
-I$S/crypto/openssl ${WERROR} ${.IMPSRC}"
 crypto/openssl/aarch64/sha1-armv8.S            optional ossl           \
-       compile-with    "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} 
${.IMPSRC}"
+       compile-with    "${CC} -c ${CFLAGS:N-mgeneral-regs-only} 
-I$S/crypto/openssl ${WERROR} ${.IMPSRC}"
 crypto/openssl/aarch64/sha256-armv8.S          optional ossl           \
-       compile-with    "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} 
${.IMPSRC}"
+       compile-with    "${CC} -c ${CFLAGS:N-mgeneral-regs-only} 
-I$S/crypto/openssl ${WERROR} ${.IMPSRC}"
 crypto/openssl/aarch64/sha512-armv8.S          optional ossl           \
-       compile-with    "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} 
${.IMPSRC}"
+       compile-with    "${CC} -c ${CFLAGS:N-mgeneral-regs-only} 
-I$S/crypto/openssl ${WERROR} ${.IMPSRC}"
 crypto/openssl/aarch64/vpaes-armv8.S           optional ossl           \
-       compile-with    "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} 
${.IMPSRC}"
+       compile-with    "${CC} -c ${CFLAGS:N-mgeneral-regs-only} 
-I$S/crypto/openssl ${WERROR} ${.IMPSRC}"
 
 dev/acpica/acpi_bus_if.m                       optional acpi
 dev/acpica/acpi_if.m                           optional acpi

Reply via email to